X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_api.c;h=59fb327f25acc9276547b6270a7de834d5395b0d;hp=7f22d17095d1a5afb90da96969edc411914e2e73;hb=669d2e6a8bdc642b6b52693f4593f199ddd7e8d2;hpb=4f5d70d375dac27459a80c1e5271697c1f46c675

diff --git a/http_message_api.c b/http_message_api.c
index 7f22d17..59fb327 100644
--- a/http_message_api.c
+++ b/http_message_api.c
@@ -1,91 +1,60 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#endif
-
-#include "php.h"
+#define HTTP_WANT_SAPI
+#define HTTP_WANT_CURL
+#define HTTP_WANT_ZLIB
 #include "php_http.h"
-#include "php_http_std_defs.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 "phpstr/phpstr.h"
-
-#define http_message_headers_cb _http_message_headers_cb
-static void _http_message_headers_cb(const char *http_line, HashTable **headers, void **message TSRMLS_DC)
+#define http_message_info_callback _http_message_info_callback
+static void _http_message_info_callback(http_message **message, HashTable **headers, http_info *info TSRMLS_DC)
 {
-	size_t line_length;
-	char *crlf = NULL;
-	http_message *new, *old = (http_message *) *message;
-
-	if (crlf = strstr(http_line, HTTP_CRLF)) {
-		line_length = crlf - http_line;
-	} else {
-		line_length = strlen(http_line);
-	}
-
+	http_message *old = *message;
+	
+	/* advance message */
 	if (old->type || zend_hash_num_elements(&old->hdrs) || PHPSTR_LEN(old)) {
-		new = http_message_new();
-
-		new->parent = old;
-		*message = new;
-		*headers = &new->hdrs;
-	} else {
-		new = old;
-	}
-
-	while (isspace(http_line[line_length-1])) --line_length;
-
-	// response
-	if (!strncmp(http_line, "HTTP/1.", lenof("HTTP/1."))) {
-		new->type = HTTP_MSG_RESPONSE;
-		new->info.response.http_version = (float) atof(http_line + lenof("HTTP/"));
-		new->info.response.code = atoi(http_line + lenof("HTTP/1.1 "));
-	} else
-	// request
-	if (!strncmp(http_line + line_length - lenof("HTTP/1.1"), "HTTP/1.", lenof("HTTP/1."))) {
-		const char *method_sep_uri = strchr(http_line, ' ');
-		new->type = HTTP_MSG_REQUEST;
-		new->info.request.http_version = (float) atof(http_line + line_length - lenof("1.1"));
-		new->info.request.method = estrndup(http_line, method_sep_uri - http_line);
-		new->info.request.URI = estrndup(method_sep_uri + 1, http_line + line_length - method_sep_uri - 1 - lenof(" HTTP/1.1"));
+		(*message) = http_message_new();
+		(*message)->parent = old;
+		(*headers) = &((*message)->hdrs);
 	}
+	
+	http_message_set_info(*message, info);
 }
 
 #define http_message_init_type _http_message_init_type
 static inline void _http_message_init_type(http_message *message, http_message_type type)
 {
+	message->http.version = .0;
+	
 	switch (message->type = type)
 	{
 		case HTTP_MSG_RESPONSE:
-			message->info.response.http_version = .0;
-			message->info.response.code = 0;
+			message->http.info.response.code = 0;
+			message->http.info.response.status = NULL;
 		break;
 
 		case HTTP_MSG_REQUEST:
-			message->info.request.http_version = .0;
-			message->info.request.method = NULL;
-			message->info.request.URI = NULL;
+			message->http.info.request.method = NULL;
+			message->http.info.request.url = NULL;
 		break;
 
 		case HTTP_MSG_NONE:
@@ -94,21 +63,10 @@ static inline void _http_message_init_type(http_message *message, http_message_t
 	}
 }
 
-#define http_message_header(m, h) _http_message_header_ex((m), (h), sizeof(h))
-#define http_message_header_ex _http_message_header_ex
-static inline zval *_http_message_header_ex(http_message *msg, char *key_str, size_t key_len)
-{
-	zval **header;
-	if (SUCCESS == zend_hash_find(&msg->hdrs, key_str, key_len, (void **) &header)) {
-		return *header;
-	}
-	return NULL;
-}
-
-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);
@@ -126,13 +84,19 @@ PHP_HTTP_API void _http_message_set_type(http_message *message, http_message_typ
 	if (type != message->type) {
 
 		/* free request info */
-		if (message->type == HTTP_MSG_REQUEST) {
-			if (message->info.request.method) {
-				efree(message->info.request.method);
-			}
-			if (message->info.request.URI) {
-				efree(message->info.request.URI);
-			}
+		switch (message->type)
+		{
+			case HTTP_MSG_REQUEST:
+				STR_FREE(message->http.info.request.method);
+				STR_FREE(message->http.info.request.url);
+			break;
+			
+			case HTTP_MSG_RESPONSE:
+				STR_FREE(message->http.info.response.status);
+			break;
+			
+			default:
+			break;
 		}
 
 		/* init */
@@ -140,91 +104,176 @@ 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 void _http_message_set_info(http_message *message, http_info *info)
 {
-	char *body = NULL;
-	zend_bool free_msg = msg ? 0 : 1;
-
-	if (message_length < HTTP_MSG_MIN_SIZE) {
-		return NULL;
+	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;
 	}
+}
 
-	if (!message) {
+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_message_headers_cb, (void **) &msg)) {
+	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_message_free(&msg);
 		}
+		http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Failed to parse message headers");
 		return NULL;
 	}
-
-	/* header parsing stops at CRLF CRLF */
-	if (body = strstr(message, HTTP_CRLF HTTP_CRLF)) {
+	
+	/* header parsing stops at (CR)LF (CR)LF */
+	if ((body = http_locate_body(message))) {
 		zval *c;
 		const char *continue_at = NULL;
+		size_t remaining = message + message_length - body;
 
-		body += lenof(HTTP_CRLF HTTP_CRLF);
+		/* message has chunked transfer encoding */
+		if ((c = http_message_header(msg, "Transfer-Encoding")) && (!strcasecmp("chunked", Z_STRVAL_P(c)))) {
+			char *decoded;
+			size_t decoded_len;
+
+			/* decode and replace Transfer-Encoding with Content-Length header */
+			if ((continue_at = http_encoding_dechunk(body, message + message_length - body, &decoded, &decoded_len))) {
+				zval *len;
+				char *tmp;
+				int tmp_len;
+
+				tmp_len = (int) spprintf(&tmp, 0, "%zu", decoded_len);
+				MAKE_STD_ZVAL(len);
+				ZVAL_STRINGL(len, tmp, tmp_len, 0);
+
+				ZVAL_ADDREF(c);
+				zend_hash_add(&msg->hdrs, "X-Original-Transfer-Encoding", sizeof("X-Original-Transfer-Encoding"), (void *) &c, sizeof(zval *), NULL);
+				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);
+				efree(decoded);
+			}
+		} else
 
 		/* message has content-length header */
-		if (c = http_message_header(msg, "Content-Length")) {
-			long len = atol(Z_STRVAL_P(c));
+		if ((c = http_message_header(msg, "Content-Length"))) {
+			ulong len = strtoul(Z_STRVAL_P(c), NULL, 10);
+			if (len > remaining) {
+				http_error_ex(HE_NOTICE, HTTP_E_MALFORMED_HEADERS, "The Content-Length header pretends a larger body than actually received (expected %lu bytes; got %lu bytes)", len, remaining);
+				len = remaining;
+			}
 			phpstr_from_string_ex(PHPSTR(msg), body, len);
 			continue_at = body + len;
 		} else
 
-		/* message has chunked transfer encoding */
-		if (c = http_message_header(msg, "Transfer-Encoding")) {
-			if (!strcasecmp("chunked", Z_STRVAL_P(c))) {
-				char *decoded;
-				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)) {
-					phpstr_from_string_ex(PHPSTR(msg), decoded, decoded_len);
-					efree(decoded);
-					{
-						zval *len;
-						char *tmp;
-
-						spprintf(&tmp, 0, "%lu", decoded_len);
-						MAKE_STD_ZVAL(len);
-						ZVAL_STRING(len, tmp, 0);
-
-						zend_hash_del(&msg->hdrs, "Transfer-Encoding", sizeof("Transfer-Encoding"));
-						zend_hash_add(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL);
+		/* message has content-range header */
+		if ((c = http_message_header(msg, "Content-Range"))) {
+			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")] == ' ')) {
+				char *total_at = NULL, *end_at = NULL;
+				char *start_at = Z_STRVAL_P(c) + sizeof("bytes");
+				
+				start = strtoul(start_at, &end_at, 10);
+				if (end_at) {
+					end = strtoul(end_at + 1, &total_at, 10);
+					if (total_at && strncmp(total_at + 1, "*", 1)) {
+						total = strtoul(total_at + 1, NULL, 10);
+					}
+					if ((len = (end + 1 - start)) > remaining) {
+						http_error_ex(HE_NOTICE, HTTP_E_MALFORMED_HEADERS, "The Content-Range header pretends a larger body than actually received (expected %lu bytes; got %lu bytes)", len, remaining);
+						len = remaining;
+					}
+					if (end >= start && (!total || end < total)) {
+						phpstr_from_string_ex(PHPSTR(msg), body, len);
+						continue_at = body + len;
 					}
 				}
 			}
-		} else
 
-		/* message has content-range header */
-		if (c = http_message_header(msg, "Content-Range")) {
-			ulong start = 0, end = 0;
-
-			sscanf(Z_STRVAL_P(c), "bytes=%lu-%lu", &start, &end);
-			if (end > start) {
-				phpstr_from_string_ex(PHPSTR(msg), body, (size_t) (end - start));
-				continue_at = body + (end - start);
+			if (!continue_at) {
+				http_error_ex(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Invalid Content-Range header: %s", Z_STRVAL_P(c));
 			}
 		} else
 
 		/* no headers that indicate content length */
-		if (1) {
-			phpstr_from_string_ex(PHPSTR(msg), body, message + message_length - body);
+		if (HTTP_MSG_TYPE(RESPONSE, msg)) {
+			phpstr_from_string_ex(PHPSTR(msg), body, remaining);
+		} else {
+			continue_at = body;
+		}
+		
+#ifdef HTTP_HAVE_ZLIB
+		/* check for compressed data */
+		if (http_message_header(msg, "Vary") && (c = http_message_header(msg, "Content-Encoding"))) {
+			char *decoded = NULL;
+			size_t decoded_len = 0;
+
+			if (	!strcasecmp(Z_STRVAL_P(c), "gzip") || 
+					!strcasecmp(Z_STRVAL_P(c), "x-gzip") ||
+					!strcasecmp(Z_STRVAL_P(c), "deflate")) {
+				http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
+			}
+			
+			if (decoded) {
+				zval *len, **original_len;
+				char *tmp;
+				int tmp_len;
+				
+				tmp_len = (int) spprintf(&tmp, 0, "%zu", decoded_len);
+				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"));
+				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;
+				PHPSTR(msg)->free = 1;
+			}
 		}
+#endif /* HTTP_HAVE_ZLIB */
 
 		/* check for following messages */
-		if (continue_at) {
+		if (continue_at && (continue_at < (message + message_length))) {
 			while (isspace(*continue_at)) ++continue_at;
 			if (continue_at < (message + message_length)) {
 				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;
@@ -242,6 +291,7 @@ PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_
 	char *key, *data;
 	ulong idx;
 	zval **header;
+	HashPosition pos1;
 
 	phpstr_init_ex(&str, 4096, 0);
 
@@ -249,15 +299,17 @@ PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_
 	{
 		case HTTP_MSG_REQUEST:
 			phpstr_appendf(&str, "%s %s HTTP/%1.1f" HTTP_CRLF,
-				msg->info.request.method,
-				msg->info.request.URI,
-				msg->info.request.http_version);
+				msg->http.info.request.method,
+				msg->http.info.request.url,
+				msg->http.version);
 		break;
 
 		case HTTP_MSG_RESPONSE:
-			phpstr_appendf(&str, "HTTP/%1.1f %d" HTTP_CRLF,
-				msg->info.response.http_version,
-				msg->info.response.code);
+			phpstr_appendf(&str, "HTTP/%1.1f %d%s%s" HTTP_CRLF,
+				msg->http.version,
+				msg->http.info.response.code,
+				*msg->http.info.response.status ? " ":"",
+				msg->http.info.response.status);
 		break;
 
 		case HTTP_MSG_NONE:
@@ -265,7 +317,7 @@ PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_
 		break;
 	}
 
-	FOREACH_HASH_KEYVAL(&msg->hdrs, key, idx, header) {
+	FOREACH_HASH_KEYVAL(pos1, &msg->hdrs, key, idx, header) {
 		if (key) {
 			zval **single_header;
 
@@ -276,9 +328,12 @@ PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_
 				break;
 
 				case IS_ARRAY:
-					FOREACH_VAL(*header, single_header) {
+				{
+					HashPosition pos2;
+					FOREACH_VAL(pos2, *header, single_header) {
 						phpstr_appendf(&str, "%s: %s" HTTP_CRLF, key, Z_STRVAL_PP(single_header));
 					}
+				}
 				break;
 			}
 
@@ -312,7 +367,7 @@ PHP_HTTP_API void _http_message_serialize(http_message *message, char **string,
 		http_message_tostring(message, &buf, &len);
 		phpstr_prepend(&str, buf, len);
 		efree(buf);
-	} while (message = message->parent);
+	} while ((message = message->parent));
 
 	buf = phpstr_data(&str, string, length);
 	if (!string) {
@@ -322,6 +377,106 @@ PHP_HTTP_API void _http_message_serialize(http_message *message, char **string,
 	phpstr_dtor(&str);
 }
 
+PHP_HTTP_API http_message *_http_message_reverse(http_message *msg)
+{
+	int i, c;
+	
+	http_message_count(c, msg);
+	
+	if (c > 1) {
+		http_message *tmp = msg, **arr = ecalloc(c, sizeof(http_message *));
+		
+		for (i = 0; i < c; ++i) {
+			arr[i] = tmp;
+			tmp = tmp->parent;
+		}
+		arr[0]->parent = NULL;
+		for (i = 0; i < c-1; ++i) {
+			arr[i+1]->parent = arr[i];
+		}
+		
+		msg = arr[c-1];
+		efree(arr);
+	}
+	
+	return msg;
+}
+
+PHP_HTTP_API http_message *_http_message_interconnect(http_message *m1, http_message *m2)
+{
+	if (m1 && m2) {
+		int i = 0, c1, c2;
+		http_message *t1 = m1, *t2 = m2, *p1, *p2;
+		
+		http_message_count(c1, m1);
+		http_message_count(c2, m2);
+		
+		while (i++ < (c1 - c2)) {
+			t1 = t1->parent;
+		}
+		while (i++ <= c1) {
+			p1 = t1->parent;
+			p2 = t2->parent;
+			t1->parent = t2;
+			t2->parent = p1;
+			t1 = p1;
+			t2 = p2;
+		}
+	} else if (!m1 && m2) {
+		m1 = m2;
+	}
+	return m1;
+}
+
+PHP_HTTP_API void _http_message_tostruct_recursive(http_message *msg, zval *obj TSRMLS_DC)
+{
+	zval strct;
+	zval *headers;
+	
+	INIT_ZARR(strct, HASH_OF(obj));
+	
+	add_assoc_long(&strct, "type", msg->type);
+	add_assoc_double(&strct, "httpVersion", msg->http.version);
+	switch (msg->type)
+	{
+		case HTTP_MSG_RESPONSE:
+			add_assoc_long(&strct, "responseCode", msg->http.info.response.code);
+			add_assoc_string(&strct, "responseStatus", msg->http.info.response.status, 1);
+		break;
+		
+		case HTTP_MSG_REQUEST:
+			add_assoc_string(&strct, "requestMethod", msg->http.info.request.method, 1);
+			add_assoc_string(&strct, "requestUrl", msg->http.info.request.url, 1);
+		break;
+		
+		case HTTP_MSG_NONE:
+			/* avoid compiler warning */
+		break;
+	}
+	
+	MAKE_STD_ZVAL(headers);
+	array_init(headers);
+	zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+	add_assoc_zval(&strct, "headers", headers);
+	
+	add_assoc_stringl(&strct, "body", PHPSTR_VAL(msg), PHPSTR_LEN(msg), 1);
+	
+	if (msg->parent) {
+		zval *parent;
+		
+		MAKE_STD_ZVAL(parent);
+		if (Z_TYPE_P(obj) == IS_ARRAY) {
+			array_init(parent);
+		} else {
+			object_init(parent);
+		}
+		add_assoc_zval(&strct, "parentMessage", parent);
+		http_message_tostruct_recursive(msg->parent, parent);
+	} else {
+		add_assoc_null(&strct, "parentMessage");
+	}
+}
+
 PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
 {
 	STATUS rs = FAILURE;
@@ -333,17 +488,26 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
 			char *key;
 			ulong idx;
 			zval **val;
+			HashPosition pos1;
 
-			FOREACH_HASH_KEYVAL(&message->hdrs, key, idx, val) {
+			FOREACH_HASH_KEYVAL(pos1, &message->hdrs, key, idx, val) {
 				if (key) {
-					char *header;
-					spprintf(&header, 0, "%s: %s", key, Z_STRVAL_PP(val));
-					http_send_header(header);
-					efree(header);
+					if (Z_TYPE_PP(val) == IS_ARRAY) {
+						zend_bool first = 1;
+						zval **data;
+						HashPosition pos2;
+						
+						FOREACH_VAL(pos2, *val, data) {
+							http_send_header_ex(key, strlen(key), Z_STRVAL_PP(data), Z_STRLEN_PP(data), first, NULL);
+							first = 0;
+						}
+					} else {
+						http_send_header_ex(key, strlen(key), Z_STRVAL_PP(val), Z_STRLEN_PP(val), 1, NULL);
+					}
 					key = NULL;
 				}
 			}
-			rs =	SUCCESS == http_send_status(message->info.response.code) &&
+			rs =	SUCCESS == http_send_status(message->http.info.response.code) &&
 					SUCCESS == http_send_data(PHPSTR_VAL(message), PHPSTR_LEN(message)) ?
 					SUCCESS : FAILURE;
 		}
@@ -353,78 +517,97 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
 		{
 #ifdef HTTP_HAVE_CURL
 			char *uri = NULL;
+			http_request request;
 			zval **zhost, options, headers;
 
+			INIT_PZVAL(&options);
+			INIT_PZVAL(&headers);
 			array_init(&options);
 			array_init(&headers);
 			zend_hash_copy(Z_ARRVAL(headers), &message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
 			add_assoc_zval(&options, "headers", &headers);
 
 			/* check host header */
-			if (SUCCESS == zend_hash_find(&message->hdrs, "Host", sizeof("Host"), (void **) &zhost)) {
-				char *colon = NULL, *host = NULL;
-				size_t host_len = 0;
-				int port = 0;
+			if (SUCCESS == zend_hash_find(&message->hdrs, "Host", sizeof("Host"), (void *) &zhost)) {
+				char *colon = NULL;
+				php_url parts, *url = php_url_parse(message->http.info.request.url);
+				
+				memset(&parts, 0, sizeof(php_url));
 
 				/* check for port */
-				if (colon = strchr(Z_STRVAL_PP(zhost), ':')) {
-					port = atoi(colon + 1);
-					host = estrndup(Z_STRVAL_PP(zhost), host_len = (Z_STRVAL_PP(zhost) - colon - 1));
+				if ((colon = strchr(Z_STRVAL_PP(zhost), ':'))) {
+					parts.port = atoi(colon + 1);
+					parts.host = estrndup(Z_STRVAL_PP(zhost), (Z_STRVAL_PP(zhost) - colon - 1));
 				} else {
-					host = estrndup(Z_STRVAL_PP(zhost), host_len = Z_STRLEN_PP(zhost));
+					parts.host = estrndup(Z_STRVAL_PP(zhost), Z_STRLEN_PP(zhost));
 				}
-				uri = http_absolute_uri_ex(
-					message->info.request.URI, strlen(message->info.request.URI),
-					NULL, 0, host, host_len, port);
-				efree(host);
+				
+				http_build_url(HTTP_URL_REPLACE, url, &parts, NULL, &uri, NULL);
+				php_url_free(url);
+				efree(parts.host);
 			} else {
-				uri = http_absolute_uri(message->info.request.URI);
+				uri = http_absolute_url(message->http.info.request.url);
 			}
 
-			if (!strcasecmp("POST", message->info.request.method)) {
-				http_request_body body = {HTTP_REQUEST_BODY_CSTRING, PHPSTR_VAL(message), PHPSTR_LEN(message)};
-				rs = http_post(uri, &body, Z_ARRVAL(options), NULL, NULL);
-			} else
-			if (!strcasecmp("GET", message->info.request.method)) {
-				rs = http_get(uri, Z_ARRVAL(options), NULL, NULL);
-			} else
-			if (!strcasecmp("HEAD", message->info.request.method)) {
-				rs = http_head(uri, Z_ARRVAL(options), NULL, NULL);
+			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 = 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);
+				}
+				http_request_dtor(&request);
 			} else {
-				http_error_ex(E_WARNING, HTTP_E_MSG,
+				http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD,
 					"Cannot send HttpMessage. Request method %s not supported",
-					message->info.request.method);
+					message->http.info.request.method);
 			}
-
 			efree(uri);
 #else
-			http_error(E_WARNING, HTTP_E_MSG, "HTTP requests not supported - ext/http was not linked against libcurl.");
+			http_error(HE_WARNING, HTTP_E_RUNTIME, "HTTP requests not supported - ext/http was not linked against libcurl.");
 #endif
 		}
 		break;
 
 		case HTTP_MSG_NONE:
 		default:
-			http_error(E_WARNING, HTTP_E_MSG, "HttpMessage is neither of type HTTP_MSG_REQUEST nor HTTP_MSG_RESPONSE");
+			http_error(HE_WARNING, HTTP_E_MESSAGE_TYPE, "HttpMessage is neither of type HTTP_MSG_REQUEST nor HTTP_MSG_RESPONSE");
 		break;
 	}
 
 	return rs;
 }
 
-PHP_HTTP_API http_message *_http_message_dup(http_message *msg TSRMLS_DC)
+PHP_HTTP_API http_message *_http_message_dup(http_message *orig TSRMLS_DC)
 {
-	/*
-	 * TODO: unroll
-	 */
-	http_message *new;
-	char *serialized_data;
-	size_t serialized_length;
-
-	http_message_serialize(msg, &serialized_data, &serialized_length);
-	new = http_message_parse(serialized_data, serialized_length);
-	efree(serialized_data);
-	return new;
+	http_message *temp, *copy = NULL;
+	http_info info;
+	
+	if (orig) {
+		info.type = orig->type;
+		info.http = orig->http;
+		
+		copy = temp = http_message_new();
+		http_message_set_info(temp, &info);
+		zend_hash_copy(&temp->hdrs, &orig->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+		phpstr_append(&temp->body, orig->body.data, orig->body.used);
+	
+		while (orig->parent) {
+			info.type = orig->parent->type;
+			info.http = orig->parent->http;
+		
+			temp->parent = http_message_new();
+			http_message_set_info(temp->parent, &info);
+			zend_hash_copy(&temp->parent->hdrs, &orig->parent->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+			phpstr_append(&temp->parent->body, orig->parent->body.data, orig->parent->body.used);
+		
+			temp = temp->parent;
+			orig = orig->parent;
+		}
+	}
+	
+	return copy;
 }
 
 PHP_HTTP_API void _http_message_dtor(http_message *message)
@@ -432,28 +615,33 @@ PHP_HTTP_API void _http_message_dtor(http_message *message)
 	if (message) {
 		zend_hash_destroy(&message->hdrs);
 		phpstr_dtor(PHPSTR(message));
-		if (HTTP_MSG_TYPE(REQUEST, message)) {
-			if (message->info.request.method) {
-				efree(message->info.request.method);
-				message->info.request.method = NULL;
-			}
-			if (message->info.request.URI) {
-				efree(message->info.request.URI);
-				message->info.request.URI = NULL;
-			}
+		
+		switch (message->type)
+		{
+			case HTTP_MSG_REQUEST:
+				STR_SET(message->http.info.request.method, NULL);
+				STR_SET(message->http.info.request.url, NULL);
+			break;
+			
+			case HTTP_MSG_RESPONSE:
+				STR_SET(message->http.info.response.status, NULL);
+			break;
+			
+			default:
+			break;
 		}
 	}
 }
 
-PHP_HTTP_API void _http_message_free(http_message *message)
+PHP_HTTP_API void _http_message_free(http_message **message)
 {
-	if (message) {
-		if (message->parent) {
-			http_message_free(message->parent);
-			message->parent = NULL;
+	if (*message) {
+		if ((*message)->parent) {
+			http_message_free(&(*message)->parent);
 		}
-		http_message_dtor(message);
-		efree(message);
+		http_message_dtor(*message);
+		efree(*message);
+		*message = NULL;
 	}
 }
 
@@ -465,3 +653,4 @@ PHP_HTTP_API void _http_message_free(http_message *message)
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
  */
+