From: Michael Wallner <mike@php.net>
Date: Wed, 28 Apr 2010 06:50:06 +0000 (+0000)
Subject: fixed bug #16893 Content not decoded with zlib support and compress enabled
X-Git-Tag: RELEASE_1_7_0~9
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=24ad0447055fe46ca3cbbcf06b6e7dbb81aafc53;p=m6w6%2Fext-http

fixed bug #16893 Content not decoded with zlib support and compress enabled
---

diff --git a/http_message_api.c b/http_message_api.c
index 67f99ae..66bc508 100644
--- a/http_message_api.c
+++ b/http_message_api.c
@@ -281,47 +281,43 @@ static inline void _http_message_body_parse(http_message *msg, const char *messa
 		
 #ifdef HTTP_HAVE_ZLIB
 		/* check for compressed data */
-		if ((c = http_message_header(msg, "Vary"))) {
-			zval_ptr_dtor(&c);
-			
-			if ((c = http_message_header(msg, "Content-Encoding"))) {
-				char *decoded = NULL;
-				size_t decoded_len = 0;
-				
-				if (	!strcasecmp(Z_STRVAL_P(c), "gzip") ||
-						!strcasecmp(Z_STRVAL_P(c), "x-gzip") ||
-						!strcasecmp(Z_STRVAL_P(c), "deflate")) {
-					http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
-				}
-				
-				if (decoded) {
-					zval *len, **original_len;
-					char *tmp;
-					int tmp_len;
-					
-					tmp_len = (int) spprintf(&tmp, 0, "%zu", decoded_len);
-					MAKE_STD_ZVAL(len);
-					ZVAL_STRINGL(len, tmp, tmp_len, 0);
-					
-					ZVAL_ADDREF(c);
-					zend_hash_update(&msg->hdrs, "X-Original-Content-Encoding", sizeof("X-Original-Content-Encoding"), (void *) &c, sizeof(zval *), NULL);
-					zend_hash_del(&msg->hdrs, "Content-Encoding", sizeof("Content-Encoding"));
-					if (SUCCESS == zend_hash_find(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &original_len)) {
-						ZVAL_ADDREF(*original_len);
-						zend_hash_update(&msg->hdrs, "X-Original-Content-Length", sizeof("X-Original-Content-Length"), (void *) original_len, sizeof(zval *), NULL);
-						zend_hash_update(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL);
-					} else {
-						zend_hash_update(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL);
-					}
-					
-					phpstr_dtor(PHPSTR(msg));
-					PHPSTR(msg)->data = decoded;
-					PHPSTR(msg)->used = decoded_len;
-					PHPSTR(msg)->free = 1;
+		if ((c = http_message_header(msg, "Content-Encoding"))) {
+			char *decoded = NULL;
+			size_t decoded_len = 0;
+
+			if (	!strcasecmp(Z_STRVAL_P(c), "gzip") ||
+					!strcasecmp(Z_STRVAL_P(c), "x-gzip") ||
+					!strcasecmp(Z_STRVAL_P(c), "deflate")) {
+				http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
+			}
+
+			if (decoded) {
+				zval *len, **original_len;
+				char *tmp;
+				int tmp_len;
+
+				tmp_len = (int) spprintf(&tmp, 0, "%zu", decoded_len);
+				MAKE_STD_ZVAL(len);
+				ZVAL_STRINGL(len, tmp, tmp_len, 0);
+
+				ZVAL_ADDREF(c);
+				zend_hash_update(&msg->hdrs, "X-Original-Content-Encoding", sizeof("X-Original-Content-Encoding"), (void *) &c, sizeof(zval *), NULL);
+				zend_hash_del(&msg->hdrs, "Content-Encoding", sizeof("Content-Encoding"));
+				if (SUCCESS == zend_hash_find(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &original_len)) {
+					ZVAL_ADDREF(*original_len);
+					zend_hash_update(&msg->hdrs, "X-Original-Content-Length", sizeof("X-Original-Content-Length"), (void *) original_len, sizeof(zval *), NULL);
+					zend_hash_update(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL);
+				} else {
+					zend_hash_update(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL);
 				}
-				
-				zval_ptr_dtor(&c);
+
+				phpstr_dtor(PHPSTR(msg));
+				PHPSTR(msg)->data = decoded;
+				PHPSTR(msg)->used = decoded_len;
+				PHPSTR(msg)->free = 1;
 			}
+
+			zval_ptr_dtor(&c);
 		}
 #endif /* HTTP_HAVE_ZLIB */
 	}
diff --git a/package.xml b/package.xml
index 06dc8fd..2e3d7b6 100644
--- a/package.xml
+++ b/package.xml
@@ -52,6 +52,7 @@ support. Parallel requests are available for PHP 5 and greater.
  - HTTP_PROXY_HTTP_1_0
 * Added request info members:
  - condition_unmet (libcurl >= 7.19.4)
+* Fixed bug #16893 (Content not decoded with zlib support and compress enabled)
 * Fixed bug #17087 (http_build_cookie() exhausts memory if cookie value is NULL)
 * Fixed bug #17169 (Wrong return value of HttpMessage::getHttpVersion())
 ]]></notes>