X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_api.c;h=dd597fccf32dbc6a466d1c857f16611a0b34085d;hp=20fc791b0c7a77020d8ce927c2c04ad0e2bf65ba;hb=f6a58b4f97105ba3c3177116c18672f1b8ba4179;hpb=b5ea2548f9717e8d0f26de29bdce6881623b67a3

diff --git a/http_message_api.c b/http_message_api.c
index 20fc791..dd597fc 100644
--- a/http_message_api.c
+++ b/http_message_api.c
@@ -28,6 +28,7 @@
 #include "php_http_send_api.h"
 #include "php_http_request_api.h"
 #include "php_http_url_api.h"
+#include "php_http_encoding_api.h"
 
 #include "phpstr/phpstr.h"
 
@@ -156,7 +157,7 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
 			size_t decoded_len;
 
 			/* decode and replace Transfer-Encoding with Content-Length header */
-			if (continue_at = http_chunked_decode(body, message + message_length - body, &decoded, &decoded_len)) {
+			if (continue_at = http_encoding_dechunk(body, message + message_length - body, &decoded, &decoded_len)) {
 				zval *len;
 				char *tmp;
 				int tmp_len;
@@ -166,6 +167,7 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
 				ZVAL_STRINGL(len, tmp, tmp_len, 0);
 
 				zend_hash_del(&msg->hdrs, "Transfer-Encoding", sizeof("Transfer-Encoding"));
+				zend_hash_del(&msg->hdrs, "Content-Length", sizeof("Content-Length"));
 				zend_hash_add(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL);
 				
 				phpstr_from_string_ex(PHPSTR(msg), decoded, decoded_len);
@@ -213,6 +215,43 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
 		} else {
 			continue_at = body;
 		}
+		
+#ifdef HTTP_HAVE_ZLIB
+		/* check for compressed data */
+		if (c = http_message_header(msg, "Content-Encoding")) {
+			char *decoded = NULL;
+			size_t decoded_len = 0;
+			
+			if (!strcasecmp(Z_STRVAL_P(c), "gzip")) {
+				http_encoding_gzdecode(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
+			} else
+			if (!strcasecmp(Z_STRVAL_P(c), "deflate")) {
+				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);
+			}
+			
+			if (decoded && decoded_len) {
+				zval *len;
+				char *tmp;
+				int tmp_len;
+				
+				tmp_len = (int) spprintf(&tmp, 0, "%lu", (ulong) decoded_len);
+				MAKE_STD_ZVAL(len);
+				ZVAL_STRINGL(len, tmp, tmp_len, 0);
+
+				zend_hash_del(&msg->hdrs, "Content-Encoding", sizeof("Content-Encoding"));
+				zend_hash_del(&msg->hdrs, "Content-Length", sizeof("Content-Length"));
+				zend_hash_add(&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;
+			}
+		}
+#endif
 
 		/* check for following messages */
 		if (continue_at) {