- fix inflating highly compressed data

- remove z_stream.msg from the error as it doesn't seem to contain anything at any time

diff --git a/http_encoding_api.c b/http_encoding_api.c
index c05d3e8096ffca0dd318184a6e6f32d3f62fd867..8c121bcd56bc69a2c6cf575d4e7d864bb381b98d 100644 (file)
--- a/http_encoding_api.c
+++ b/http_encoding_api.c
@@ -217,11 +217,12 @@ STATUS _http_encoding_deflate(int flags, const char *data, size_t data_len, char
                Z.avail_out = *encoded_len;
                
                status = deflate(&Z, Z_FINISH);
+               deflateEnd(&Z);
+               
                if (Z_STREAM_END == status) {
                        /* size buffer down to actual length */
                        *encoded = erealloc(*encoded, Z.total_out + 1);
                        (*encoded)[*encoded_len = Z.total_out] = '\0';
-                       deflateEnd(&Z);
                        return SUCCESS;
                } else {
                        STR_SET(*encoded, NULL);
@@ -229,8 +230,7 @@ STATUS _http_encoding_deflate(int flags, const char *data, size_t data_len, char
                }
        }
        
-       http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not deflate data: %s (%s)", zError(status), Z.msg);
-       deflateEnd(&Z);
+       http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not deflate data: %s (%s)", zError(status));
        return FAILURE;
 }
 
@@ -254,14 +254,13 @@ retry_inflate:
                Z.avail_in = data_len;
                
                do {
-                       phpstr_resize(&buffer, data_len);
+                       phpstr_resize(&buffer, data_len << 2);
 
                        do {
-                               Z.next_out = buffer.data + (buffer.used += Z.total_out);
-                               Z.avail_out = (buffer.free -= Z.total_out);
+                               Z.avail_out = (buffer.free -= Z.total_out - buffer.used);
+                               Z.next_out = buffer.data + (buffer.used = Z.total_out);
                                status = inflate(&Z, Z_NO_FLUSH);
                        } while (Z_OK == status);
-                       
                } while (Z_BUF_ERROR == status && ++max < HTTP_ENCODING_MAXTRY);
                
                if (Z_DATA_ERROR == status && HTTP_WINDOW_BITS_ANY == wbits) {
@@ -271,18 +270,19 @@ retry_inflate:
                        goto retry_inflate;
                }
                
+               inflateEnd(&Z);
+               
                if (Z_STREAM_END == status) {
-                       *decoded = erealloc(buffer.data, (buffer.used += Z.total_out) + 1);
-                       (*decoded)[*decoded_len = buffer.used] = '\0';
-                       inflateEnd(&Z);
+                       *decoded_len = Z.total_out;
+                       *decoded = erealloc(buffer.data, *decoded_len + 1);
+                       (*decoded)[*decoded_len] = '\0';
                        return SUCCESS;
                } else {
                        phpstr_dtor(&buffer);
                }
        }
        
-       http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not inflate data: %s (%s)", zError(status), Z.msg);
-       inflateEnd(&Z);
+       http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not inflate data: %s", zError(status));
        return FAILURE;
 }
 

diff --git a/php_http_encoding_api.h b/php_http_encoding_api.h
index 5fc523105e44ac70bda0062998e589412f28b059..70cc42bd9834074e3199a1b4a320ae1cc709f064 100644 (file)
--- a/php_http_encoding_api.h
+++ b/php_http_encoding_api.h
@@ -25,8 +25,7 @@ PHP_HTTP_API zend_bool _http_encoding_response_start(size_t content_length TSRML
 
 extern PHP_MINIT_FUNCTION(http_encoding);
 
-/* max count of uncompress trials, alloc_size <<= 2 for each try */
-#define HTTP_ENCODING_MAXTRY 10
+#define HTTP_ENCODING_MAXTRY 100
 /* safe padding */
 #define HTTP_ENCODING_SAFPAD 28
 /* add 1% extra space in case we need to encode widely differing (binary) data */