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

diff --git a/http_message_api.c b/http_message_api.c
index 77f18e0..d9b33d1 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,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)