- Fixed build on php-trunk

[m6w6/ext-http] / http_encoding_api.c

diff --git a/http_encoding_api.c b/http_encoding_api.c
index 7a6b04311e71cb1c602cd0d02c42f1422d9b1138..8ce0280ca22c5e0911d2e5115674f972b47ba27f 100644 (file)
--- a/http_encoding_api.c
+++ b/http_encoding_api.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2007, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -211,10 +211,13 @@ PHP_HTTP_API int _http_encoding_response_start(size_t content_length, zend_bool
 #endif /* HTTP_HAVE_ZLIB */
        } else if (content_length && !ohandler) {
                /* emit a content-length header */
-               char cl_header_str[128];
-               size_t cl_header_len;
-               cl_header_len = snprintf(cl_header_str, sizeof(cl_header_str), "Content-Length: %zu", content_length);
-               http_send_header_string_ex(cl_header_str, cl_header_len, 1);
+               phpstr header;
+
+               phpstr_init(&header);
+               phpstr_appendf(&header, "Content-Length: %zu", content_length);
+               phpstr_fix(&header);
+               http_send_header_string_ex(PHPSTR_VAL(&header), PHPSTR_LEN(&header), 1);
+               phpstr_dtor(&header);
        } else {
                HTTP_G->send.deflate.encoding = 0;
        }
@@ -327,10 +330,13 @@ retry_raw_inflate:
                Z.avail_in = data_len;
                
                switch (status = http_inflate_rounds(&Z, Z_NO_FLUSH, decoded, decoded_len)) {
-                       case Z_OK:
                        case Z_STREAM_END:
                                inflateEnd(&Z);
                                return SUCCESS;
+
+                       case Z_OK:
+                               status = Z_DATA_ERROR;
+                               break;
                        
                        case Z_DATA_ERROR:
                                /* raw deflated data? */
@@ -341,6 +347,10 @@ retry_raw_inflate:
                                }
                }
                inflateEnd(&Z);
+
+               if (decoded_len && *decoded) {
+                       efree(*decoded);
+               }
        }
        
        http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not inflate data: %s", zError(status));
@@ -694,7 +704,10 @@ void _http_ob_deflatehandler(char *output, uint output_len, char **handled_outpu
        
        if (HTTP_G->send.deflate.stream) {
                if (output_len) {
-                       http_encoding_deflate_stream_update((http_encoding_stream *) HTTP_G->send.deflate.stream, output, output_len, handled_output, handled_output_len);
+                       size_t tmp_len;
+                       
+                       http_encoding_deflate_stream_update((http_encoding_stream *) HTTP_G->send.deflate.stream, output, output_len, handled_output, &tmp_len);
+                       *handled_output_len = tmp_len;
                }
                
                if (mode & PHP_OUTPUT_HANDLER_END) {
@@ -733,7 +746,10 @@ void _http_ob_inflatehandler(char *output, uint output_len, char **handled_outpu
        
        if (HTTP_G->send.inflate.stream) {
                if (output_len) {
-                       http_encoding_inflate_stream_update((http_encoding_stream *) HTTP_G->send.inflate.stream, output, output_len, handled_output, handled_output_len);
+                       size_t tmp_len;
+                       
+                       http_encoding_inflate_stream_update((http_encoding_stream *) HTTP_G->send.inflate.stream, output, output_len, handled_output, &tmp_len);
+                       *handled_output_len = tmp_len;
                }
                
                if (mode & PHP_OUTPUT_HANDLER_END) {