X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_message_api.c;h=6b88cc56f9b6c2b8c5cbf2b6af7125fe1d12580f;hb=6fc78f4b8ea8a34a40f06985648822fbaa7ffb30;hp=77f18e017c25aea336472b50aa50217fd7e10fde;hpb=a0bca521b491711e43aef74fe19c23a8eb4d0777;p=m6w6%2Fext-http

diff --git a/http_message_api.c b/http_message_api.c
index 77f18e0..6b88cc5 100644
--- 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);
 
@@ -189,9 +189,9 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
 			ulong total = 0, start = 0, end = 0, len = 0;
 			
 			if (!strncasecmp(Z_STRVAL_P(c), "bytes", lenof("bytes")) && 
-					(Z_STRVAL_P(c)[lenof("bytes")] == '=' || Z_STRVAL_P(c)[lenof("bytes")] == ' ')) {
+					(Z_STRVAL_P(c)[lenof("bytes")] == ':' || Z_STRVAL_P(c)[lenof("bytes")] == ' ')) {
 				char *total_at = NULL, *end_at = NULL;
-				char *start_at = Z_STRVAL_P(c) + lenof("bytes=");
+				char *start_at = Z_STRVAL_P(c) + sizeof("bytes");
 				
 				start = strtoul(start_at, &end_at, 10);
 				if (end_at) {
@@ -224,44 +224,49 @@ 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)
+#	if !defined(HTTP_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 && !HTTP_HAVE_ZLIB */
+#	endif /* !HTTP_HAVE_ZLIB */
 
-#	define DECODE_WITH_EXT_ZLIB() \
+#	define DECODE_WITH_EXT_ZLIB(function, S, L) \
+				ZVAL_STRINGL(&func, function, lenof(function), 0); \
+				ZVAL_STRINGL(&arg, (S), (L), 0); \
 				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") || !strcasecmp(Z_STRVAL_P(c), "x-gzip")) {
 #	ifdef HTTP_HAVE_ZLIB
 				http_encoding_gzdecode(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
 #	else
-				ZVAL_STRINGL(&arg, PHPSTR_VAL(msg) + 10, PHPSTR_LEN(msg) - 18, 0);
-				DECODE_WITH_EXT_ZLIB();
+				DECODE_WITH_EXT_ZLIB("gzinflate", PHPSTR_VAL(msg) + 10, PHPSTR_LEN(msg) - 18);
 #	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
-				ZVAL_STRINGL(&arg, PHPSTR_VAL(msg), PHPSTR_LEN(msg), 0);
-				DECODE_WITH_EXT_ZLIB();
+				DECODE_WITH_EXT_ZLIB("gzinflate", PHPSTR_VAL(msg), PHPSTR_LEN(msg));
+#	endif /* HTTP_HAVE_ZLIB */
+			} else if (!strcasecmp(Z_STRVAL_P(c), "compress") || !strcasecmp(Z_STRVAL_P(c), "x-compress")) {
+#	ifdef HTTP_HAVE_ZLIB
+				http_encoding_uncompress(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
+#	else
+				DECODE_WITH_EXT_ZLIB("gzuncompress", PHPSTR_VAL(msg), PHPSTR_LEN(msg));
 #	endif /* HTTP_HAVE_ZLIB */
 			}
 			
 			if (decoded) {
-				zval *len;
+				zval *len, **original_len;
 				char *tmp;
 				int tmp_len;
 				
@@ -269,10 +274,17 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
 				MAKE_STD_ZVAL(len);
 				ZVAL_STRINGL(len, tmp, tmp_len, 0);
 
+				ZVAL_ADDREF(c);
+				zend_hash_add(&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"));
-				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);
-				
+				if (SUCCESS == zend_hash_find(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void **) &original_len)) {
+					ZVAL_ADDREF(*original_len);					
+					zend_hash_add(&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_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;