X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_message_api.c;h=2a7a1ebbe6bc7ce7ab83672c52ac1bce2d98554e;hb=62279bb901c6180b0939cff882e69d218ab2206c;hp=5a2302b5205f890cebdbc212e0517b40c3737a73;hpb=7fef44c902c86eebce30f36003a27905fbaeba65;p=m6w6%2Fext-http

diff --git a/http_message_api.c b/http_message_api.c
index 5a2302b..2a7a1eb 100644
--- a/http_message_api.c
+++ b/http_message_api.c
@@ -84,10 +84,10 @@ static inline void _http_message_init_type(http_message *message, http_message_t
 	}
 }
 
-PHP_HTTP_API http_message *_http_message_init_ex(http_message *message, http_message_type type)
+PHP_HTTP_API http_message *_http_message_init_ex(http_message *message, http_message_type type ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 {
 	if (!message) {
-		message = ecalloc(1, sizeof(http_message));
+		message = ecalloc_rel(1, sizeof(http_message));
 	}
 
 	http_message_init_type(message, type);
@@ -125,24 +125,26 @@ PHP_HTTP_API void _http_message_set_type(http_message *message, http_message_typ
 	}
 }
 
-PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char *message, size_t message_length TSRMLS_DC)
+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;
 	zend_bool free_msg = msg ? 0 : 1;
 
 	if ((!message) || (message_length < HTTP_MSG_MIN_SIZE)) {
+		http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Empty or too short HTTP message: '%s'", message);
 		return NULL;
 	}
 
-	msg = http_message_init(msg);
+	msg = http_message_init_rel(msg, 0);
 
 	if (SUCCESS != http_parse_headers_cb(message, &msg->hdrs, 1, (http_info_callback) http_message_info_callback, (void **) &msg)) {
 		if (free_msg) {
 			http_message_free(&msg);
 		}
+		http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Failed to parse message headers");
 		return NULL;
 	}
-
+	
 	/* header parsing stops at (CR)LF (CR)LF */
 	if ((body = http_locate_body(message))) {
 		zval *c;
@@ -248,22 +250,12 @@ 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")) {
-#	ifdef HTTP_HAVE_ZLIB
-				http_encoding_gzdecode(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
-#	else
+#	ifndef HTTP_HAVE_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
-				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));
+				http_encoding_gzdecode(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
+			} else if (!strcasecmp(Z_STRVAL_P(c), "deflate") || !strcasecmp(Z_STRVAL_P(c), "compress") || !strcasecmp(Z_STRVAL_P(c), "x-compress")) {
+				http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
 #	endif /* HTTP_HAVE_ZLIB */
 			}
 			
@@ -302,7 +294,7 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
 				http_message *next = NULL, *most = NULL;
 
 				/* set current message to parent of most parent following messages and return deepest */
-				if ((most = next = http_message_parse(continue_at, message + message_length - continue_at))) {
+				if ((most = next = http_message_parse_rel(NULL, continue_at, message + message_length - continue_at))) {
 					while (most->parent) most = most->parent;
 					most->parent = msg;
 					msg = next;
@@ -526,11 +518,11 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
 				uri = http_absolute_uri(message->http.info.request.URI);
 			}
 
-			if (request.meth = http_request_method_exists(1, 0, message->http.info.request.method)) {
-				http_request_body body = {HTTP_REQUEST_BODY_CSTRING, PHPSTR_VAL(message), PHPSTR_LEN(message)};
+			if ((request.meth = http_request_method_exists(1, 0, message->http.info.request.method))) {
+				http_request_body body;
 				
 				http_request_init_ex(&request, NULL, request.meth, uri);
-				request.body = &body;
+				request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_CSTRING, PHPSTR_VAL(message), PHPSTR_LEN(message), 0);
 				if (SUCCESS == (rs = http_request_prepare(&request, NULL))) {
 					http_request_exec(&request);
 				}