X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_api.c;h=0b5908ecab8d5ea4598241fe440ad62929457af5;hp=16a2c05ec5c0d71b4477aa6d2252f3574a90e08f;hb=d046681a7b929ef813849cfe38fbceb333f0b0eb;hpb=e6d36989f0650bf097b6909c41cdd20a1ffcd6af

diff --git a/http_message_api.c b/http_message_api.c
index 16a2c05..0b5908e 100644
--- a/http_message_api.c
+++ b/http_message_api.c
@@ -6,22 +6,17 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#endif
-
+#define HTTP_WANT_SAPI
 #define HTTP_WANT_CURL
 #define HTTP_WANT_ZLIB
 #include "php_http.h"
 
-#include "SAPI.h"
-
 #include "php_http_api.h"
 #include "php_http_encoding_api.h"
 #include "php_http_headers_api.h"
@@ -42,22 +37,7 @@ static void _http_message_info_callback(http_message **message, HashTable **head
 		(*headers) = &((*message)->hdrs);
 	}
 	
-	(*message)->http.version = info->http.version;
-	
-	switch (info->type)
-	{
-		case IS_HTTP_REQUEST:
-			(*message)->type = HTTP_MSG_REQUEST;
-			HTTP_INFO(*message).request.url = estrdup(HTTP_INFO(info).request.url);
-			HTTP_INFO(*message).request.method = estrdup(HTTP_INFO(info).request.method);
-		break;
-		
-		case IS_HTTP_RESPONSE:
-			(*message)->type = HTTP_MSG_RESPONSE;
-			HTTP_INFO(*message).response.code = HTTP_INFO(info).response.code;
-			HTTP_INFO(*message).response.status = estrdup(HTTP_INFO(info).response.status);
-		break;
-	}
+	http_message_set_info(*message, info);
 }
 
 #define http_message_init_type _http_message_init_type
@@ -124,6 +104,27 @@ PHP_HTTP_API void _http_message_set_type(http_message *message, http_message_typ
 	}
 }
 
+PHP_HTTP_API void _http_message_set_info(http_message *message, http_info *info)
+{
+	message->http.version = info->http.version;
+	
+	switch (message->type = info->type)
+	{
+		case IS_HTTP_REQUEST:
+			HTTP_INFO(message).request.url = estrdup(HTTP_INFO(info).request.url);
+			STR_SET(HTTP_INFO(message).request.method, estrdup(HTTP_INFO(info).request.method));
+		break;
+		
+		case IS_HTTP_RESPONSE:
+			HTTP_INFO(message).response.code = HTTP_INFO(info).response.code;
+			STR_SET(HTTP_INFO(message).response.status, estrdup(HTTP_INFO(info).response.status));
+		break;
+		
+		default:
+		break;
+	}
+}
+
 PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char *message, size_t message_length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
 {
 	const char *body = NULL;
@@ -233,9 +234,7 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
 
 			if (	!strcasecmp(Z_STRVAL_P(c), "gzip") || 
 					!strcasecmp(Z_STRVAL_P(c), "x-gzip") ||
-					!strcasecmp(Z_STRVAL_P(c), "deflate") ||
-					!strcasecmp(Z_STRVAL_P(c), "compress") ||
-					!strcasecmp(Z_STRVAL_P(c), "x-compress")) {
+					!strcasecmp(Z_STRVAL_P(c), "deflate")) {
 				http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
 			}
 			
@@ -492,7 +491,7 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
 					parts.host = estrndup(Z_STRVAL_PP(zhost), Z_STRLEN_PP(zhost));
 				}
 				
-				http_build_url(url, &parts, NULL, &uri, NULL);
+				http_build_url(HTTP_URL_REPLACE, url, &parts, NULL, &uri, NULL);
 				php_url_free(url);
 				efree(parts.host);
 			} else {