* Fixed bug which caused GZIP encoded archives to be decoded

[m6w6/ext-http] / http_message_api.c

diff --git a/http_message_api.c b/http_message_api.c
index c28ff6f7945c8a152573cf0ea374f06c0c1e497e..d9b33d1eac8334ee72e6d63513b32f71367d4ce5 100644 (file)
--- a/http_message_api.c
+++ b/http_message_api.c
@@ -15,19 +15,19 @@
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 #endif
-#include "php.h"
 
+#define HTTP_WANT_CURL
 #include "php_http.h"
-#include "php_http_std_defs.h"
+
+#include "SAPI.h"
+
 #include "php_http_api.h"
-#include "php_http_message_api.h"
+#include "php_http_encoding_api.h"
 #include "php_http_headers_api.h"
-#include "php_http_send_api.h"
+#include "php_http_message_api.h"
 #include "php_http_request_api.h"
+#include "php_http_send_api.h"
 #include "php_http_url_api.h"
-#include "php_http_encoding_api.h"
-
-#include "phpstr/phpstr.h"
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
@@ -224,7 +224,7 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
                
 #if defined(HTTP_HAVE_ZLIB) || defined(HAVE_ZLIB)
                /* check for compressed data */
-               if ((c = http_message_header(msg, "Content-Encoding"))) {
+               if (http_message_header(msg, "Vary") && (c = http_message_header(msg, "Content-Encoding"))) {
                        char *decoded = NULL;
                        size_t decoded_len = 0;
 #      if defined(HAVE_ZLIB) && !defined(HTTP_HAVE_ZLIB)