- fixed issues ifndef HTTP_HAVE_ZLIB and enable gzipped response decoding ifdef HAVE_ZLIB

diff --git a/http_encoding_api.c b/http_encoding_api.c
index 00ea70283cf385dc44d5a72a15ca1fed8cb14987..d1ce3da984441d1a839590c642aa6ed68c9433ed 100644 (file)
--- a/http_encoding_api.c
+++ b/http_encoding_api.c
@@ -592,6 +592,7 @@ PHP_HTTP_API zend_bool _http_encoding_response_start(size_t content_length TSRML
                        }
                } else {
 #ifndef HTTP_HAVE_ZLIB
+                       HTTP_G(send).gzip_encoding = 0;
                        php_start_ob_buffer_named("ob_gzhandler", 0, 0 TSRMLS_CC);
 #else
                        HashTable *selected;

diff --git a/http_message_api.c b/http_message_api.c
index d0c8f486947c41d6236854d5b5a9b00470b99149..74c000e58f0a11fbc131aa8c3756c33d7cd4978f 100644 (file)
--- a/http_message_api.c
+++ b/http_message_api.c
@@ -216,20 +216,42 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
                        continue_at = body;
                }
                
-#ifdef HTTP_HAVE_ZLIB
+#if defined(HTTP_HAVE_ZLIB) || defined(HAVE_ZLIB)
                /* check for compressed data */
                if (c = http_message_header(msg, "Content-Encoding")) {
                        char *decoded = NULL;
                        size_t decoded_len = 0;
+#      ifdef HAVE_ZLIB
+                       zval func, retval, arg, *args[1];
+                       INIT_PZVAL(&func);
+                       INIT_PZVAL(&retval);
+                       INIT_PZVAL(&arg);
+                       ZVAL_STRINGL(&func, "gzinflate", lenof("gzinflate"), 0);
+                       args[0] = &arg;
+#      endif /* HAVE_ZLIB */
+
+#      define DECODE_WITH_EXT_ZLIB() \
+                               if (SUCCESS == call_user_function(EG(function_table), NULL, &func, &retval, 1, args TSRMLS_CC)) { \
+                                       if (Z_TYPE(retval) == IS_STRING) { \
+                                               decoded = Z_STRVAL(retval); \
+                                               decoded_len = Z_STRLEN(retval); \
+                                       } \
+                               }
                        
-                       if (!strcasecmp(Z_STRVAL_P(c), "gzip")) {
+                       if (!strcasecmp(Z_STRVAL_P(c), "gzip") || !strcasecmp(Z_STRVAL_P(c), "x-gzip")) {
+#      ifdef HTTP_HAVE_ZLIB
                                http_encoding_gzdecode(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
-                       } else
-                       if (!strcasecmp(Z_STRVAL_P(c), "deflate")) {
+#      else
+                               ZVAL_STRINGL(&arg, PHPSTR_VAL(msg) + 10, PHPSTR_LEN(msg) - 18, 0);
+                               DECODE_WITH_EXT_ZLIB();
+#      endif /* HTTP_HAVE_ZLIB */
+                       } else if (!strcasecmp(Z_STRVAL_P(c), "deflate")) {
+#      ifdef HTTP_HAVE_ZLIB
                                http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
-                       } else
-                       if (!strcasecmp(Z_STRVAL_P(c), "compress")) {
-                               http_encoding_uncompress(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
+#      else
+                               ZVAL_STRINGL(&arg, PHPSTR_VAL(msg), PHPSTR_LEN(msg), 0);
+                               DECODE_WITH_EXT_ZLIB();
+#      endif /* HTTP_HAVE_ZLIB */
                        }
                        
                        if (decoded && decoded_len) {
@@ -251,7 +273,7 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
                                PHPSTR(msg)->free = 1;
                        }
                }
-#endif
+#endif /* HTTP_HAVE_ZLIB || HAVE_ZLIB */
 
                /* check for following messages */
                if (continue_at) {

diff --git a/http_util_object.c b/http_util_object.c
index a97984d7bea76f5f3a6d8a2319852a92a89535fd..42a094c914cc6a530ebb956fa5ea0377ad9e6f0f 100644 (file)
--- a/http_util_object.c
+++ b/http_util_object.c
@@ -124,12 +124,14 @@ zend_function_entry http_util_object_fe[] = {
        HTTP_UTIL_ALIAS(parseMessage, http_parse_message)
        HTTP_UTIL_ALIAS(parseHeaders, http_parse_headers)
        HTTP_UTIL_ALIAS(chunkedDecode, http_chunked_decode)
+#ifdef HTTP_HAVE_ZLIB
        HTTP_UTIL_ALIAS(gzEncode, http_gzencode)
        HTTP_UTIL_ALIAS(gzDecode, http_gzdecode)
        HTTP_UTIL_ALIAS(deflate, http_deflate)
        HTTP_UTIL_ALIAS(inflate, http_inflate)
        HTTP_UTIL_ALIAS(compress, http_compress)
        HTTP_UTIL_ALIAS(uncompress, http_uncompress)
+#endif /* HTTP_HAVE_ZLIB */
        HTTP_UTIL_ALIAS(support, http_support)
        
        EMPTY_FUNCTION_ENTRY