- we actually never return by ref

[m6w6/ext-http] / http_deflatestream_object.c

diff --git a/http_deflatestream_object.c b/http_deflatestream_object.c
index 4060ba4cf98158b5fa44ac401e954ed2eb34e30b..0caa74b5800d524770200b08689c3d813b5d8bac 100644 (file)
--- a/http_deflatestream_object.c
+++ b/http_deflatestream_object.c
@@ -6,17 +6,12 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
-
-#ifdef HAVE_CONFIG_H
-#      include "config.h"
-#endif
-
 #define HTTP_WANT_ZLIB
 #include "php_http.h"
 
@@ -27,19 +22,25 @@
 #include "php_http_exception_object.h"
 #include "php_http_deflatestream_object.h"
 
-#define HTTP_BEGIN_ARGS(method, ret_ref, req_args)     HTTP_BEGIN_ARGS_EX(HttpDeflateStream, method, ret_ref, req_args)
-#define HTTP_EMPTY_ARGS(method, ret_ref)                       HTTP_EMPTY_ARGS_EX(HttpDeflateStream, method, ret_ref)
-#define HTTP_DEFLATE_ME(method, visibility)                    PHP_ME(HttpDeflateStream, method, HTTP_ARGS(HttpDeflateStream, method), visibility)
+#define HTTP_BEGIN_ARGS(method, req_args)      HTTP_BEGIN_ARGS_EX(HttpDeflateStream, method, 0, req_args)
+#define HTTP_EMPTY_ARGS(method)                                HTTP_EMPTY_ARGS_EX(HttpDeflateStream, method, 0)
+#define HTTP_DEFLATE_ME(method, visibility)    PHP_ME(HttpDeflateStream, method, HTTP_ARGS(HttpDeflateStream, method), visibility)
 
-HTTP_BEGIN_ARGS(__construct, 0, 0)
+HTTP_BEGIN_ARGS(__construct, 0)
        HTTP_ARG_VAL(flags, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(update, 0, 1)
+HTTP_BEGIN_ARGS(update, 1)
        HTTP_ARG_VAL(data, 0)
 HTTP_END_ARGS;
 
-HTTP_EMPTY_ARGS(finish, 0);
+HTTP_BEGIN_ARGS(flush, 0)
+       HTTP_ARG_VAL(data, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(finish, 0)
+       HTTP_ARG_VAL(data, 0)
+HTTP_END_ARGS;
 
 #define http_deflatestream_object_declare_default_properties() _http_deflatestream_object_declare_default_properties(TSRMLS_C)
 static inline void _http_deflatestream_object_declare_default_properties(TSRMLS_D);
@@ -48,6 +49,7 @@ zend_class_entry *http_deflatestream_object_ce;
 zend_function_entry http_deflatestream_object_fe[] = {
        HTTP_DEFLATE_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
        HTTP_DEFLATE_ME(update, ZEND_ACC_PUBLIC)
+       HTTP_DEFLATE_ME(flush, ZEND_ACC_PUBLIC)
        HTTP_DEFLATE_ME(finish, ZEND_ACC_PUBLIC)
        
        EMPTY_FUNCTION_ENTRY
@@ -115,6 +117,11 @@ static inline void _http_deflatestream_object_declare_default_properties(TSRMLS_
        DCL_CONST(long, "LEVEL_DEF", HTTP_DEFLATE_LEVEL_DEF);
        DCL_CONST(long, "LEVEL_MIN", HTTP_DEFLATE_LEVEL_MIN);
        DCL_CONST(long, "LEVEL_MAX", HTTP_DEFLATE_LEVEL_MAX);
+       DCL_CONST(long, "STRATEGY_DEF", HTTP_DEFLATE_STRATEGY_DEF);
+       DCL_CONST(long, "STRATEGY_FILT", HTTP_DEFLATE_STRATEGY_FILT);
+       DCL_CONST(long, "STRATEGY_HUFF", HTTP_DEFLATE_STRATEGY_HUFF);
+       DCL_CONST(long, "STRATEGY_RLE", HTTP_DEFLATE_STRATEGY_RLE);
+       DCL_CONST(long, "STRATEGY_FIXED", HTTP_DEFLATE_STRATEGY_FIXED);
 #endif
 }
 
@@ -175,10 +182,8 @@ PHP_METHOD(HttpDeflateStream, update)
                RETURN_FALSE;
        }
        
-       if (!obj->stream) {
-               if (!(obj->stream = http_encoding_deflate_stream_init(NULL, 0))) {
-                       RETURN_FALSE;
-               }
+       if (!obj->stream && !(obj->stream = http_encoding_deflate_stream_init(NULL, 0))) {
+               RETURN_FALSE;
        }
        
        if (SUCCESS == http_encoding_deflate_stream_update(obj->stream, data, data_len, &encoded, &encoded_len)) {
@@ -189,7 +194,52 @@ PHP_METHOD(HttpDeflateStream, update)
 }
 /* }}} */
 
-/* {{{ proto string HttpDeflateStream::finish()
+/* {{{ proto string HttpDeflateStream::flush([string data])
+ *
+ * Flushes the deflate stream.
+ * 
+ * Returns some deflated data as string on success or FALSE on failure.
+ */ 
+PHP_METHOD(HttpDeflateStream, flush)
+{
+       int data_len = 0;
+       size_t updated_len = 0, encoded_len = 0;
+       char *updated = NULL, *encoded = NULL, *data = NULL;
+       getObject(http_deflatestream_object, obj);
+       
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &data, &data_len)) {
+               RETURN_FALSE;
+       }
+       
+       if (!obj->stream && !(obj->stream = http_encoding_deflate_stream_init(NULL, 0))) {
+               RETURN_FALSE;
+       }
+       
+       if (data_len) {
+               if (SUCCESS != http_encoding_deflate_stream_update(obj->stream, data, data_len, &updated, &updated_len)) {
+                       RETURN_FALSE;
+               }
+       }
+       
+       if (SUCCESS == http_encoding_deflate_stream_flush(obj->stream, &encoded, &encoded_len)) {
+               if (updated_len) {
+                       updated = erealloc(updated, updated_len + encoded_len + 1);
+                       updated[updated_len + encoded_len] = '\0';
+                       memcpy(updated + updated_len, encoded, encoded_len);
+                       STR_FREE(encoded);
+                       updated_len += encoded_len;
+                       RETURN_STRINGL(updated, updated_len, 0);
+               } else {
+                       RETVAL_STRINGL(encoded, encoded_len, 0);
+               }
+       } else {
+               RETVAL_FALSE;
+       }
+       STR_FREE(updated);
+}
+/* }}} */
+
+/* {{{ proto string HttpDeflateStream::finish([string data])
  *
  * Finalizes the deflate stream.  The deflate stream can be reused after finalizing.
  * 
@@ -197,19 +247,39 @@ PHP_METHOD(HttpDeflateStream, update)
  */ 
 PHP_METHOD(HttpDeflateStream, finish)
 {
-       size_t encoded_len = 0;
-       char *encoded = NULL;
+       int data_len = 0;
+       size_t updated_len = 0, encoded_len = 0;
+       char *updated = NULL, *encoded = NULL, *data = NULL;
        getObject(http_deflatestream_object, obj);
        
-       NO_ARGS;
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &data, &data_len)) {
+               RETURN_FALSE;
+       }
        
-       if (!obj->stream) {
+       if (!obj->stream && !(obj->stream = http_encoding_deflate_stream_init(NULL, 0))) {
                RETURN_FALSE;
        }
        
+       if (data_len) {
+               if (SUCCESS != http_encoding_deflate_stream_update(obj->stream, data, data_len, &updated, &updated_len)) {
+                       RETURN_FALSE;
+               }
+       }
+       
        if (SUCCESS == http_encoding_deflate_stream_finish(obj->stream, &encoded, &encoded_len)) {
-               RETVAL_STRINGL(encoded, encoded_len, 0);
+               if (updated_len) {
+                       updated = erealloc(updated, updated_len + encoded_len + 1);
+                       updated[updated_len + encoded_len] = '\0';
+                       memcpy(updated + updated_len, encoded, encoded_len);
+                       STR_FREE(encoded);
+                       updated_len += encoded_len;
+                       RETVAL_STRINGL(updated, updated_len, 0);
+               } else {
+                       STR_FREE(updated);
+                       RETVAL_STRINGL(encoded, encoded_len, 0);
+               }
        } else {
+               STR_FREE(updated);
                RETVAL_FALSE;
        }