X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=3adbb273e76c523c3ce869aa1ac31ab0293718b8;hp=6e2fc27239550b4602526adc2882d0ca60b86e98;hb=fb8b98d958d628027081c1a140c488665588d37c;hpb=b3fac83fc5b626daf078fc16739325b3accd65d5

diff --git a/http_message_object.c b/http_message_object.c
index 6e2fc27..3adbb27 100644
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -14,6 +14,7 @@
 
 #define HTTP_WANT_SAPI
 #define HTTP_WANT_CURL
+#define HTTP_WANT_MAGIC
 #include "php_http.h"
 
 #ifdef ZEND_ENGINE_2
@@ -32,11 +33,9 @@
 #include "php_http_request_api.h"
 #include "php_http_request_object.h"
 
-#ifndef WONKY
-#	ifdef HAVE_SPL
+#if defined(HTTP_HAVE_SPL) && !defined(WONKY)
 /* SPL doesn't install its headers */
 extern PHPAPI zend_class_entry *spl_ce_Countable;
-#	endif
 #endif
 
 #define HTTP_BEGIN_ARGS(method, req_args) 	HTTP_BEGIN_ARGS_EX(HttpMessage, method, 0, req_args)
@@ -47,8 +46,9 @@ HTTP_BEGIN_ARGS(__construct, 0)
 	HTTP_ARG_VAL(message, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(fromString, 1)
+HTTP_BEGIN_ARGS(factory, 0)
 	HTTP_ARG_VAL(message, 0)
+	HTTP_ARG_VAL(class_name, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getBody);
@@ -56,6 +56,10 @@ HTTP_BEGIN_ARGS(setBody, 1)
 	HTTP_ARG_VAL(body, 0)
 HTTP_END_ARGS;
 
+HTTP_BEGIN_ARGS(getHeader, 1)
+	HTTP_ARG_VAL(header, 0)
+HTTP_END_ARGS;
+
 HTTP_EMPTY_ARGS(getHeaders);
 HTTP_BEGIN_ARGS(setHeaders, 1)
 	HTTP_ARG_VAL(headers, 0)
@@ -96,6 +100,11 @@ HTTP_BEGIN_ARGS(setHttpVersion, 1)
 	HTTP_ARG_VAL(http_version, 0)
 HTTP_END_ARGS;
 
+HTTP_BEGIN_ARGS(guessContentType, 1)
+	HTTP_ARG_VAL(magic_file, 0)
+	HTTP_ARG_VAL(magic_mode, 0)
+HTTP_END_ARGS;
+
 HTTP_EMPTY_ARGS(getParentMessage);
 HTTP_EMPTY_ARGS(send);
 HTTP_BEGIN_ARGS(toString, 0)
@@ -136,6 +145,7 @@ zend_function_entry http_message_object_fe[] = {
 	HTTP_MESSAGE_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	HTTP_MESSAGE_ME(getBody, ZEND_ACC_PUBLIC)
 	HTTP_MESSAGE_ME(setBody, ZEND_ACC_PUBLIC)
+	HTTP_MESSAGE_ME(getHeader, ZEND_ACC_PUBLIC)
 	HTTP_MESSAGE_ME(getHeaders, ZEND_ACC_PUBLIC)
 	HTTP_MESSAGE_ME(setHeaders, ZEND_ACC_PUBLIC)
 	HTTP_MESSAGE_ME(addHeaders, ZEND_ACC_PUBLIC)
@@ -151,6 +161,7 @@ zend_function_entry http_message_object_fe[] = {
 	HTTP_MESSAGE_ME(setRequestUrl, ZEND_ACC_PUBLIC)
 	HTTP_MESSAGE_ME(getHttpVersion, ZEND_ACC_PUBLIC)
 	HTTP_MESSAGE_ME(setHttpVersion, ZEND_ACC_PUBLIC)
+	HTTP_MESSAGE_ME(guessContentType, ZEND_ACC_PUBLIC)
 	HTTP_MESSAGE_ME(getParentMessage, ZEND_ACC_PUBLIC)
 	HTTP_MESSAGE_ME(send, ZEND_ACC_PUBLIC)
 	HTTP_MESSAGE_ME(toString, ZEND_ACC_PUBLIC)
@@ -172,7 +183,8 @@ zend_function_entry http_message_object_fe[] = {
 
 	ZEND_MALIAS(HttpMessage, __toString, toString, HTTP_ARGS(HttpMessage, toString), ZEND_ACC_PUBLIC)
 
-	HTTP_MESSAGE_ME(fromString, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	HTTP_MESSAGE_ME(factory, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	ZEND_MALIAS(HttpMessage, fromString, factory, HTTP_ARGS(HttpMessage, factory), ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	
 	HTTP_MESSAGE_ME(detach, ZEND_ACC_PUBLIC)
 	HTTP_MESSAGE_ME(prepend, ZEND_ACC_PUBLIC)
@@ -187,7 +199,7 @@ PHP_MINIT_FUNCTION(http_message_object)
 	HTTP_REGISTER_CLASS_EX(HttpMessage, http_message_object, NULL, 0);
 	
 #ifndef WONKY
-#	ifdef HAVE_SPL
+#	ifdef HTTP_HAVE_SPL
 	zend_class_implements(http_message_object_ce TSRMLS_CC, 3, spl_ce_Countable, zend_ce_serializable, zend_ce_iterator);
 #	else
 	zend_class_implements(http_message_object_ce TSRMLS_CC, 2, zend_ce_serializable, zend_ce_iterator);
@@ -340,7 +352,8 @@ zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message
 	}
 
 	ALLOC_HASHTABLE(OBJ_PROP(o));
-	zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
+	zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0);
+	zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
 
 	ov.handle = putObject(http_message_object, o);
 	ov.handlers = &http_message_object_handlers;
@@ -350,18 +363,20 @@ zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message
 
 zend_object_value _http_message_object_clone_obj(zval *this_ptr TSRMLS_DC)
 {
-	getObject(http_message_object, obj);
-	return http_message_object_new_ex(Z_OBJCE_P(this_ptr), http_message_dup(obj->message), NULL);
+	zend_object_value new_ov;
+	http_message_object *new_obj = NULL;
+	getObject(http_message_object, old_obj);
+	
+	new_ov = http_message_object_new_ex(old_obj->zo.ce, http_message_dup(old_obj->message), &new_obj);
+	zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC);
+	
+	return new_ov;
 }
 
 void _http_message_object_free(zend_object *object TSRMLS_DC)
 {
 	http_message_object *o = (http_message_object *) object;
 
-	if (OBJ_PROP(o)) {
-		zend_hash_destroy(OBJ_PROP(o));
-		FREE_HASHTABLE(OBJ_PROP(o));
-	}
 	if (o->message) {
 		http_message_dtor(o->message);
 		efree(o->message);
@@ -374,7 +389,7 @@ void _http_message_object_free(zend_object *object TSRMLS_DC)
 		p.value.obj = o->parent;
 		zend_objects_store_del_ref(&p TSRMLS_CC);
 	}
-	efree(o);
+	freeObject(o);
 }
 
 static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC)
@@ -410,24 +425,24 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 		case HTTP_MSG_PROPHASH_TYPE:
 		case HTTP_MSG_CHILD_PROPHASH_TYPE:
 			RETVAL_LONG(msg->type);
-		break;
+			break;
 
 		case HTTP_MSG_PROPHASH_HTTP_VERSION:
 		case HTTP_MSG_CHILD_PROPHASH_HTTP_VERSION:
 			RETVAL_DOUBLE(msg->http.version);
-		break;
+			break;
 
 		case HTTP_MSG_PROPHASH_BODY:
 		case HTTP_MSG_CHILD_PROPHASH_BODY:
 			phpstr_fix(PHPSTR(msg));
 			RETVAL_PHPSTR(PHPSTR(msg), 0, 1);
-		break;
+			break;
 
 		case HTTP_MSG_PROPHASH_HEADERS:
 		case HTTP_MSG_CHILD_PROPHASH_HEADERS:
 			array_init(return_value);
 			zend_hash_copy(Z_ARRVAL_P(return_value), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
-		break;
+			break;
 
 		case HTTP_MSG_PROPHASH_PARENT_MESSAGE:
 		case HTTP_MSG_CHILD_PROPHASH_PARENT_MESSAGE:
@@ -436,7 +451,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 			} else {
 				RETVAL_NULL();
 			}
-		break;
+			break;
 
 		case HTTP_MSG_PROPHASH_REQUEST_METHOD:
 		case HTTP_MSG_CHILD_PROPHASH_REQUEST_METHOD:
@@ -445,7 +460,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 			} else {
 				RETVAL_NULL();
 			}
-		break;
+			break;
 
 		case HTTP_MSG_PROPHASH_REQUEST_URL:
 		case HTTP_MSG_CHILD_PROPHASH_REQUEST_URL:
@@ -454,7 +469,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 			} else {
 				RETVAL_NULL();
 			}
-		break;
+			break;
 
 		case HTTP_MSG_PROPHASH_RESPONSE_CODE:
 		case HTTP_MSG_CHILD_PROPHASH_RESPONSE_CODE:
@@ -463,7 +478,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 			} else {
 				RETVAL_NULL();
 			}
-		break;
+			break;
 		
 		case HTTP_MSG_PROPHASH_RESPONSE_STATUS:
 		case HTTP_MSG_CHILD_PROPHASH_RESPONSE_STATUS:
@@ -472,7 +487,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 			} else {
 				RETVAL_NULL();
 			}
-		break;
+			break;
 		
 		default:
 #ifdef WONKY
@@ -480,7 +495,6 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 #else
 			RETVAL_NULL();
 #endif
-		break;
 	}
 
 	return return_value;
@@ -514,27 +528,27 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 		case HTTP_MSG_CHILD_PROPHASH_TYPE:
 			convert_to_long(cpy);
 			http_message_set_type(msg, Z_LVAL_P(cpy));
-		break;
+			break;
 
 		case HTTP_MSG_PROPHASH_HTTP_VERSION:
 		case HTTP_MSG_CHILD_PROPHASH_HTTP_VERSION:
 			convert_to_double(cpy);
 			msg->http.version = Z_DVAL_P(cpy);
-		break;
+			break;
 
 		case HTTP_MSG_PROPHASH_BODY:
 		case HTTP_MSG_CHILD_PROPHASH_BODY:
 			convert_to_string(cpy);
 			phpstr_dtor(PHPSTR(msg));
 			phpstr_from_string_ex(PHPSTR(msg), Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
-		break;
+			break;
 
 		case HTTP_MSG_PROPHASH_HEADERS:
 		case HTTP_MSG_CHILD_PROPHASH_HEADERS:
 			convert_to_array(cpy);
 			zend_hash_clean(&msg->hdrs);
 			zend_hash_copy(&msg->hdrs, Z_ARRVAL_P(cpy), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
-		break;
+			break;
 
 		case HTTP_MSG_PROPHASH_PARENT_MESSAGE:
 		case HTTP_MSG_CHILD_PROPHASH_PARENT_MESSAGE:
@@ -547,7 +561,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 				Z_OBJ_ADDREF_P(value);
 				obj->parent = value->value.obj;
 			}
-		break;
+			break;
 
 		case HTTP_MSG_PROPHASH_REQUEST_METHOD:
 		case HTTP_MSG_CHILD_PROPHASH_REQUEST_METHOD:
@@ -555,7 +569,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 				convert_to_string(cpy);
 				STR_SET(msg->http.info.request.method, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
 			}
-		break;
+			break;
 
 		case HTTP_MSG_PROPHASH_REQUEST_URL:
 		case HTTP_MSG_CHILD_PROPHASH_REQUEST_URL:
@@ -563,7 +577,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 				convert_to_string(cpy);
 				STR_SET(msg->http.info.request.url, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
 			}
-		break;
+			break;
 
 		case HTTP_MSG_PROPHASH_RESPONSE_CODE:
 		case HTTP_MSG_CHILD_PROPHASH_RESPONSE_CODE:
@@ -571,7 +585,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 				convert_to_long(cpy);
 				msg->http.info.response.code = Z_LVAL_P(cpy);
 			}
-		break;
+			break;
 		
 		case HTTP_MSG_PROPHASH_RESPONSE_STATUS:
 		case HTTP_MSG_CHILD_PROPHASH_RESPONSE_STATUS:
@@ -579,13 +593,13 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 				convert_to_string(cpy);
 				STR_SET(msg->http.info.response.status, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
 			}
-		break;
+			break;
 		
 		default:
 #ifdef WONKY
 			zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
 #endif
-		break;
+			break;
 	}
 	zval_free(&cpy);
 }
@@ -596,7 +610,7 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
 	getObjectEx(http_message_object, obj, object);
 	http_message *msg = obj->message;
 	HashTable *props = OBJ_PROP(obj);
-	zval array;
+	zval array, *parent;
 	
 	INIT_ZARR(array, props);
 
@@ -621,21 +635,20 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
 	ASSOC_PROP(array, long, "type", msg->type);
 	ASSOC_PROP(array, double, "httpVersion", msg->http.version);
 
-	switch (msg->type)
-	{
+	switch (msg->type) {
 		case HTTP_MSG_REQUEST:
 			ASSOC_PROP(array, long, "responseCode", 0);
 			ASSOC_STRINGL(array, "responseStatus", "", 0);
-			ASSOC_STRING(array, "requestMethod", msg->http.info.request.method);
-			ASSOC_STRING(array, "requestUrl", msg->http.info.request.url);
-		break;
+			ASSOC_STRING(array, "requestMethod", STR_PTR(msg->http.info.request.method));
+			ASSOC_STRING(array, "requestUrl", STR_PTR(msg->http.info.request.url));
+			break;
 
 		case HTTP_MSG_RESPONSE:
 			ASSOC_PROP(array, long, "responseCode", msg->http.info.response.code);
-			ASSOC_STRING(array, "responseStatus", msg->http.info.response.status);
+			ASSOC_STRING(array, "responseStatus", STR_PTR(msg->http.info.response.status));
 			ASSOC_STRINGL(array, "requestMethod", "", 0);
 			ASSOC_STRINGL(array, "requestUrl", "", 0);
-		break;
+			break;
 
 		case HTTP_MSG_NONE:
 		default:
@@ -643,7 +656,7 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
 			ASSOC_STRINGL(array, "responseStatus", "", 0);
 			ASSOC_STRINGL(array, "requestMethod", "", 0);
 			ASSOC_STRINGL(array, "requestUrl", "", 0);
-		break;
+			break;
 	}
 
 	MAKE_STD_ZVAL(headers);
@@ -651,6 +664,14 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
 	zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
 	ASSOC_PROP(array, zval, "headers", headers);
 	ASSOC_STRINGL(array, "body", PHPSTR_VAL(msg), PHPSTR_LEN(msg));
+	
+	MAKE_STD_ZVAL(parent);
+	if (msg->parent) {
+		ZVAL_OBJVAL(parent, obj->parent, 1);
+	} else {
+		ZVAL_NULL(parent);
+	}
+	ASSOC_PROP(array, zval, "parentMessage", parent);
 
 	return OBJ_PROP(obj);
 }
@@ -658,16 +679,7 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
 /* ### USERLAND ### */
 
 /* {{{ proto void HttpMessage::__construct([string message])
- *
- * Instantiate a new HttpMessage object.
- * 
- * Accepts an optional string parameter containing a single or several 
- * consecutive HTTP messages.  The constructed object will actually 
- * represent the *last* message of the passed string.  If there were
- * prior messages, those can be accessed by HttpMessage::getParentMessage().
- * 
- * Throws HttpMalformedHeaderException.
- */
+	Create a new HttpMessage object instance. */
 PHP_METHOD(HttpMessage, __construct)
 {
 	int length = 0;
@@ -695,40 +707,28 @@ PHP_METHOD(HttpMessage, __construct)
 }
 /* }}} */
 
-/* {{{ proto static HttpMessage HttpMessage::fromString(string raw_message[, string class_name = "HttpMessage"])
- *
- * Create an HttpMessage object from a string. Kind of a static constructor.
- * 
- * Expects a string parameter containing a single or several consecutive
- * HTTP messages.  Accepts an optional string parameter specifying the class to use.
- * 
- * Returns an HttpMessage object on success or NULL on failure.
- * 
- * Throws HttpMalformedHeadersException.
- */
-PHP_METHOD(HttpMessage, fromString)
+/* {{{ proto static HttpMessage HttpMessage::factory([string raw_message[, string class_name = "HttpMessage"]])
+	Create a new HttpMessage object instance. */
+PHP_METHOD(HttpMessage, factory)
 {
-	char *string = NULL, *class_name = NULL;
-	int length = 0, class_length = 0;
+	char *string = NULL, *cn = NULL;
+	int length = 0, cl = 0;
 	http_message *msg = NULL;
+	zend_object_value ov;
+	http_message_object *obj = NULL;
 
 	RETVAL_NULL();
 	
 	SET_EH_THROW_HTTP();
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &string, &length, &class_name, &class_length)) {
-		if ((msg = http_message_parse(string, length))) {
-			zend_class_entry *ce = http_message_object_ce;
-			
-			if (class_name && *class_name) {
-				ce = zend_fetch_class(class_name, class_length, ZEND_FETCH_CLASS_DEFAULT TSRMLS_CC);
-				if (ce && !instanceof_function(ce, http_message_object_ce TSRMLS_CC)) {
-					http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Class %s does not extend HttpMessage", class_name);
-					ce = NULL;
-				}
-			}
-			if (ce) {
-				RETVAL_OBJVAL(http_message_object_new_ex(ce, msg, NULL), 0);
-			}
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ss", &string, &length, &cn, &cl)) {
+		if (length) {
+			msg = http_message_parse(string, length);
+		}
+		if ((msg || !length) && SUCCESS == http_object_new(&ov, cn, cl, _http_message_object_new_ex, http_message_object_ce, msg, &obj)) {
+			RETVAL_OBJVAL(ov, 0);
+		}
+		if (obj && !obj->message) {
+			obj->message = http_message_new();
 		}
 	}
 	SET_EH_NORMAL();
@@ -736,16 +736,12 @@ PHP_METHOD(HttpMessage, fromString)
 /* }}} */
 
 /* {{{ proto string HttpMessage::getBody()
- *
- * Get the body of the parsed HttpMessage.
- * 
- * Returns the message body as string.
- */
+	Get the body of the parsed HttpMessage. */
 PHP_METHOD(HttpMessage, getBody)
 {
 	NO_ARGS;
 
-	IF_RETVAL_USED {
+	if (return_value_used) {
 		getObject(http_message_object, obj);
 		RETURN_PHPSTR(&obj->message->body, PHPSTR_FREE_NOT, 1);
 	}
@@ -753,12 +749,7 @@ PHP_METHOD(HttpMessage, getBody)
 /* }}} */
 
 /* {{{ proto void HttpMessage::setBody(string body)
- *
- * Set the body of the HttpMessage.
- * NOTE: Don't forget to update any headers accordingly.
- * 
- * Expects a string parameter containing the new body of the message.
- */
+	Set the body of the HttpMessage. NOTE: Don't forget to update any headers accordingly. */
 PHP_METHOD(HttpMessage, setBody)
 {
 	char *body;
@@ -772,62 +763,65 @@ PHP_METHOD(HttpMessage, setBody)
 }
 /* }}} */
 
+/* {{{ proto string HttpMessage::getHeader(string header)
+	Get message header. */
+PHP_METHOD(HttpMessage, getHeader)
+{
+	zval *header;
+	char *orig_header, *nice_header;
+	int header_len;
+	getObject(http_message_object, obj);
+	
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &orig_header, &header_len)) {
+		RETURN_FALSE;
+	}
+	
+	nice_header = pretty_key(estrndup(orig_header, header_len), header_len, 1, 1);
+	if ((header = http_message_header_ex(obj->message, nice_header, header_len + 1, 0))) {
+		RETVAL_ZVAL(header, 1, 1);
+	}
+	efree(nice_header);
+}
+/* }}} */
+
 /* {{{ proto array HttpMessage::getHeaders()
- *
- * Get Message Headers.
- * 
- * Returns an associative array containing the messages HTTP headers.
- */
+	Get Message Headers. */
 PHP_METHOD(HttpMessage, getHeaders)
 {
 	NO_ARGS;
 
-	IF_RETVAL_USED {
-		zval headers;
+	if (return_value_used) {
 		getObject(http_message_object, obj);
 
-		INIT_ZARR(headers, &obj->message->hdrs);
 		array_init(return_value);
-		array_copy(&headers, return_value);
+		array_copy(&obj->message->hdrs, Z_ARRVAL_P(return_value));
 	}
 }
 /* }}} */
 
 /* {{{ proto void HttpMessage::setHeaders(array headers)
- *
- * Sets new headers.
- * 
- * Expects an associative array as parameter containing the new HTTP headers,
- * which will replace *all* previous HTTP headers of the message.
- */
+	Sets new headers. */
 PHP_METHOD(HttpMessage, setHeaders)
 {
-	zval *new_headers, old_headers;
+	zval *new_headers = NULL;
 	getObject(http_message_object, obj);
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &new_headers)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!", &new_headers)) {
 		return;
 	}
 
 	zend_hash_clean(&obj->message->hdrs);
-	INIT_ZARR(old_headers, &obj->message->hdrs);
-	array_copy(new_headers, &old_headers);
+	if (new_headers) {
+		array_copy(Z_ARRVAL_P(new_headers), &obj->message->hdrs);
+	}
 }
 /* }}} */
 
 /* {{{ proto void HttpMessage::addHeaders(array headers[, bool append = false])
- *
- * Add headers. If append is true, headers with the same name will be separated, else overwritten.
- * 
- * Expects an associative array as parameter containing the additional HTTP headers
- * to add to the messages existing headers.  If the optional bool parameter is true,
- * and a header with the same name of one to add exists already, this respective
- * header will be converted to an array containing both header values, otherwise
- * it will be overwritten with the new header value.
- */
+	Add headers. If append is true, headers with the same name will be separated, else overwritten. */
 PHP_METHOD(HttpMessage, addHeaders)
 {
-	zval old_headers, *new_headers;
+	zval *new_headers;
 	zend_bool append = 0;
 	getObject(http_message_object, obj);
 
@@ -835,26 +829,17 @@ PHP_METHOD(HttpMessage, addHeaders)
 		return;
 	}
 
-	INIT_ZARR(old_headers, &obj->message->hdrs);
-	if (append) {
-		array_append(new_headers, &old_headers);
-	} else {
-		array_merge(new_headers, &old_headers);
-	}
+	array_join(Z_ARRVAL_P(new_headers), &obj->message->hdrs, append, ARRAY_JOIN_STRONLY|ARRAY_JOIN_PRETTIFY);
 }
 /* }}} */
 
 /* {{{ proto int HttpMessage::getType()
- *
- * Get Message Type. (HTTP_MSG_NONE|HTTP_MSG_REQUEST|HTTP_MSG_RESPONSE)
- * 
- * Returns the HttpMessage::TYPE.
- */
+	Get Message Type. (HTTP_MSG_NONE|HTTP_MSG_REQUEST|HTTP_MSG_RESPONSE) */
 PHP_METHOD(HttpMessage, getType)
 {
 	NO_ARGS;
 
-	IF_RETVAL_USED {
+	if (return_value_used) {
 		getObject(http_message_object, obj);
 		RETURN_LONG(obj->message->type);
 	}
@@ -862,11 +847,7 @@ PHP_METHOD(HttpMessage, getType)
 /* }}} */
 
 /* {{{ proto void HttpMessage::setType(int type)
- *
- * Set Message Type. (HTTP_MSG_NONE|HTTP_MSG_REQUEST|HTTP_MSG_RESPONSE)
- * 
- * Expects an int parameter, the HttpMessage::TYPE.
- */
+	Set Message Type. (HTTP_MSG_NONE|HTTP_MSG_REQUEST|HTTP_MSG_RESPONSE) */
 PHP_METHOD(HttpMessage, setType)
 {
 	long type;
@@ -880,17 +861,12 @@ PHP_METHOD(HttpMessage, setType)
 /* }}} */
 
 /* {{{ proto int HttpMessage::getResponseCode()
- *
- * Get the Response Code of the Message.
- * 
- * Returns the HTTP response code if the message is of type 
- * HttpMessage::TYPE_RESPONSE, else FALSE.
- */
+	Get the Response Code of the Message. */
 PHP_METHOD(HttpMessage, getResponseCode)
 {
 	NO_ARGS;
 
-	IF_RETVAL_USED {
+	if (return_value_used) {
 		getObject(http_message_object, obj);
 		HTTP_CHECK_MESSAGE_TYPE_RESPONSE(obj->message, RETURN_FALSE);
 		RETURN_LONG(obj->message->http.info.response.code);
@@ -899,14 +875,7 @@ PHP_METHOD(HttpMessage, getResponseCode)
 /* }}} */
 
 /* {{{ proto bool HttpMessage::setResponseCode(int code)
- *
- * Set the response code of an HTTP Response Message.
- * 
- * Expects an int parameter with the HTTP response code.
- * 
- * Returns TRUE on success, or FALSE if the message is not of type
- * HttpMessage::TYPE_RESPONSE or the response code is out of range (100-510).
- */
+	Set the response code of an HTTP Response Message. */
 PHP_METHOD(HttpMessage, setResponseCode)
 {
 	long code;
@@ -928,17 +897,12 @@ PHP_METHOD(HttpMessage, setResponseCode)
 /* }}} */
 
 /* {{{ proto string HttpMessage::getResponseStatus()
- *
- * Get the Response Status of the message (i.e. the string following the response code).
- *
- * Returns the HTTP response status string if the message is of type 
- * HttpMessage::TYPE_RESPONSE, else FALSE.
- */
+	Get the Response Status of the message (i.e. the string following the response code). */
 PHP_METHOD(HttpMessage, getResponseStatus)
 {
 	NO_ARGS;
 	
-	IF_RETVAL_USED {
+	if (return_value_used) {
 		getObject(http_message_object, obj);
 		HTTP_CHECK_MESSAGE_TYPE_RESPONSE(obj->message, RETURN_FALSE);
 		RETURN_STRING(obj->message->http.info.response.status, 1);
@@ -947,14 +911,7 @@ PHP_METHOD(HttpMessage, getResponseStatus)
 /* }}} */
 
 /* {{{ proto bool HttpMessage::setResponseStatus(string status)
- *
- * Set the Response Status of the HTTP message (i.e. the string following the response code).
- *
- * Expects a string parameter containing the response status text.
- *
- * Returns TRUE on success or FALSE if the message is not of type
- * HttpMessage::TYPE_RESPONSE.
- */
+	Set the Response Status of the HTTP message (i.e. the string following the response code). */
 PHP_METHOD(HttpMessage, setResponseStatus)
 {
 	char *status;
@@ -972,17 +929,12 @@ PHP_METHOD(HttpMessage, setResponseStatus)
 /* }}} */
 
 /* {{{ proto string HttpMessage::getRequestMethod()
- *
- * Get the Request Method of the Message.
- * 
- * Returns the request method name on success, or FALSE if the message is
- * not of type HttpMessage::TYPE_REQUEST.
- */
+	Get the Request Method of the Message. */
 PHP_METHOD(HttpMessage, getRequestMethod)
 {
 	NO_ARGS;
 
-	IF_RETVAL_USED {
+	if (return_value_used) {
 		getObject(http_message_object, obj);
 		HTTP_CHECK_MESSAGE_TYPE_REQUEST(obj->message, RETURN_FALSE);
 		RETURN_STRING(obj->message->http.info.request.method, 1);
@@ -991,14 +943,7 @@ PHP_METHOD(HttpMessage, getRequestMethod)
 /* }}} */
 
 /* {{{ proto bool HttpMessage::setRequestMethod(string method)
- *
- * Set the Request Method of the HTTP Message.
- * 
- * Expects a string parameter containing the request method name.
- * 
- * Returns TRUE on success, or FALSE if the message is not of type
- * HttpMessage::TYPE_REQUEST or an invalid request method was supplied. 
- */
+	Set the Request Method of the HTTP Message. */
 PHP_METHOD(HttpMessage, setRequestMethod)
 {
 	char *method;
@@ -1014,8 +959,8 @@ PHP_METHOD(HttpMessage, setRequestMethod)
 		http_error(HE_WARNING, HTTP_E_INVALID_PARAM, "Cannot set HttpMessage::requestMethod to an empty string");
 		RETURN_FALSE;
 	}
-	if (SUCCESS != http_check_method(method)) {
-		http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Unkown request method: %s", method);
+	if (!http_request_method_exists(1, 0, method)) {
+		http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Unknown request method: %s", method);
 		RETURN_FALSE;
 	}
 
@@ -1025,17 +970,12 @@ PHP_METHOD(HttpMessage, setRequestMethod)
 /* }}} */
 
 /* {{{ proto string HttpMessage::getRequestUrl()
- *
- * Get the Request URL of the Message.
- * 
- * Returns the request url as string on success, or FALSE if the message
- * is not of type HttpMessage::TYPE_REQUEST. 
- */
+	Get the Request URL of the Message. */
 PHP_METHOD(HttpMessage, getRequestUrl)
 {
 	NO_ARGS;
 
-	IF_RETVAL_USED {
+	if (return_value_used) {
 		getObject(http_message_object, obj);
 		HTTP_CHECK_MESSAGE_TYPE_REQUEST(obj->message, RETURN_FALSE);
 		RETURN_STRING(obj->message->http.info.request.url, 1);
@@ -1044,14 +984,7 @@ PHP_METHOD(HttpMessage, getRequestUrl)
 /* }}} */
 
 /* {{{ proto bool HttpMessage::setRequestUrl(string url)
- *
- * Set the Request URL of the HTTP Message.
- * 
- * Expects a string parameters containing the request url.
- * 
- * Returns TRUE on success, or FALSE if the message is not of type
- * HttpMessage::TYPE_REQUEST or supplied URL was empty.
- */
+	Set the Request URL of the HTTP Message. */
 PHP_METHOD(HttpMessage, setRequestUrl)
 {
 	char *URI;
@@ -1073,16 +1006,12 @@ PHP_METHOD(HttpMessage, setRequestUrl)
 /* }}} */
 
 /* {{{ proto string HttpMessage::getHttpVersion()
- *
- * Get the HTTP Protocol Version of the Message.
- * 
- * Returns the HTTP protocol version as string.
- */
+	Get the HTTP Protocol Version of the Message. */
 PHP_METHOD(HttpMessage, getHttpVersion)
 {
 	NO_ARGS;
 
-	IF_RETVAL_USED {
+	if (return_value_used) {
 		char ver[4] = {0};
 		getObject(http_message_object, obj);
 
@@ -1093,13 +1022,7 @@ PHP_METHOD(HttpMessage, getHttpVersion)
 /* }}} */
 
 /* {{{ proto bool HttpMessage::setHttpVersion(string version)
- *
- * Set the HTTP Protocol version of the Message.
- * 
- * Expects a string parameter containing the HTTP protocol version.
- * 
- * Returns TRUE on success, or FALSE if supplied version is out of range (1.0/1.1).
- */
+	Set the HTTP Protocol version of the Message. */
 PHP_METHOD(HttpMessage, setHttpVersion)
 {
 	char v[4];
@@ -1122,14 +1045,33 @@ PHP_METHOD(HttpMessage, setHttpVersion)
 }
 /* }}} */
 
+/* {{{ proto string HttpMessage::guessContentType(string magic_file[, int magic_mode = MAGIC_MIME])
+	Attempts to guess the content type of supplied payload through libmagic. */
+PHP_METHOD(HttpMessage, guessContentType)
+{
+#ifdef HTTP_HAVE_MAGIC
+	char *magic_file, *ct = NULL;
+	int magic_file_len;
+	long magic_mode = MAGIC_MIME;
+	
+	RETVAL_FALSE;
+	SET_EH_THROW_HTTP();
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &magic_file, &magic_file_len, &magic_mode)) {
+		getObject(http_message_object, obj);
+		if ((ct = http_guess_content_type(magic_file, magic_mode, PHPSTR_VAL(&obj->message->body), PHPSTR_LEN(&obj->message->body), SEND_DATA))) {
+			RETVAL_STRING(ct, 0);
+		}
+	}
+	SET_EH_NORMAL();
+#else
+	http_error(HE_THROW, HTTP_E_RUNTIME, "Cannot guess Content-Type; libmagic not available");
+	RETURN_FALSE;
+#endif
+}
+/* }}} */
+
 /* {{{ proto HttpMessage HttpMessage::getParentMessage()
- *
- * Get parent Message.
- * 
- * Returns the parent HttpMessage on success, or NULL if there's none.
- *
- * Throws HttpMessageException.
- */
+	Get parent Message. */
 PHP_METHOD(HttpMessage, getParentMessage)
 {
 	SET_EH_THROW_HTTP();
@@ -1147,12 +1089,7 @@ PHP_METHOD(HttpMessage, getParentMessage)
 /* }}} */
 
 /* {{{ proto bool HttpMessage::send()
- *
- * Send the Message according to its type as Response or Request.
- * This provides limited functionality compared to HttpRequest and HttpResponse.
- * 
- * Returns TRUE on success, or FALSE on failure.
- */
+	Send the Message according to its type as Response or Request. */
 PHP_METHOD(HttpMessage, send)
 {
 	getObject(http_message_object, obj);
@@ -1164,17 +1101,10 @@ PHP_METHOD(HttpMessage, send)
 /* }}} */
 
 /* {{{ proto string HttpMessage::toString([bool include_parent = false])
- *
- * Get the string representation of the Message.
- * 
- * Accepts a bool parameter which specifies whether the returned string
- * should also contain any parent messages.
- * 
- * Returns the full message as string.
- */
+	Get the string representation of the Message. */
 PHP_METHOD(HttpMessage, toString)
 {
-	IF_RETVAL_USED {
+	if (return_value_used) {
 		char *string;
 		size_t length;
 		zend_bool include_parent = 0;
@@ -1195,30 +1125,23 @@ PHP_METHOD(HttpMessage, toString)
 /* }}} */
 
 /* {{{ proto HttpRequest|HttpResponse HttpMessage::toMessageTypeObject(void)
- *
- * Creates an object regarding to the type of the message.
- *
- * Returns either an HttpRequest or HttpResponse object on success, or NULL on failure.
- *
- * Throws HttpRuntimeException, HttpMessageTypeException, HttpHeaderException.
- */
+	Creates an object regarding to the type of the message. Returns either an HttpRequest or HttpResponse object on success, or NULL on failure. */
 PHP_METHOD(HttpMessage, toMessageTypeObject)
 {
 	SET_EH_THROW_HTTP();
 	
 	NO_ARGS;
 	
-	IF_RETVAL_USED {
+	if (return_value_used) {
 		getObject(http_message_object, obj);
 		
-		switch (obj->message->type)
-		{
+		switch (obj->message->type) {
 			case HTTP_MSG_REQUEST:
 			{
 #ifdef HTTP_HAVE_CURL
 				int method;
 				char *url;
-				zval tmp, body, *array, *headers, *host = http_message_header(obj->message, "Host");
+				zval body, *array, *headers, *host = http_message_header(obj->message, "Host");
 				php_url hurl, *purl = php_url_parse(obj->message->http.info.request.url);
 				
 				MAKE_STD_ZVAL(array);
@@ -1226,6 +1149,7 @@ PHP_METHOD(HttpMessage, toMessageTypeObject)
 				
 				memset(&hurl, 0, sizeof(php_url));
 				hurl.host = host ? Z_STRVAL_P(host) : NULL;
+				zval_ptr_dtor(&host);
 				http_build_url(HTTP_URL_REPLACE, purl, &hurl, NULL, &url, NULL);
 				php_url_free(purl);
 				add_assoc_string(array, "url", url, 0);
@@ -1241,8 +1165,7 @@ PHP_METHOD(HttpMessage, toMessageTypeObject)
 				
 				MAKE_STD_ZVAL(headers);
 				array_init(headers);
-				INIT_ZARR(tmp, &obj->message->hdrs);
-				array_copy(&tmp, headers);
+				array_copy(&obj->message->hdrs, Z_ARRVAL_P(headers));
 				add_assoc_zval(array, "headers", headers);
 				
 				object_init_ex(return_value, http_request_object_ce);
@@ -1255,16 +1178,14 @@ PHP_METHOD(HttpMessage, toMessageTypeObject)
 #else
 				http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot transform HttpMessage to HttpRequest (missing curl support)");
 #endif
+				break;
 			}
-			break;
 			
 			case HTTP_MSG_RESPONSE:
 			{
 #ifndef WONKY
 				HashPosition pos1, pos2;
-				ulong idx;
-				uint key_len;
-				char *key = NULL;
+				HashKey key = initHashKey(0);
 				zval **header, **h, *body;
 				
 				if (obj->message->http.info.response.code) {
@@ -1273,31 +1194,30 @@ PHP_METHOD(HttpMessage, toMessageTypeObject)
 				
 				object_init_ex(return_value, http_response_object_ce);
 				
-				FOREACH_HASH_KEYLENVAL(pos1, &obj->message->hdrs, key, key_len, idx, header) {
-					if (key) {
-						zval zkey;
+				FOREACH_HASH_KEYVAL(pos1, &obj->message->hdrs, key, header) {
+					if (key.type == HASH_KEY_IS_STRING) {
+						zval *zkey;
 						
-						INIT_PZVAL(&zkey);
-						ZVAL_STRINGL(&zkey, key, key_len, 0);
+						MAKE_STD_ZVAL(zkey);
+						ZVAL_STRINGL(zkey, key.str, key.len - 1, 1);
 						
-						switch (Z_TYPE_PP(header))
-						{
+						switch (Z_TYPE_PP(header)) {
 							case IS_ARRAY:
 							case IS_OBJECT:
 								FOREACH_HASH_VAL(pos2, HASH_OF(*header), h) {
 									ZVAL_ADDREF(*h);
-									zend_call_method_with_2_params(&return_value, http_response_object_ce, NULL, "setheader", NULL, &zkey, *h);
+									zend_call_method_with_2_params(&return_value, http_response_object_ce, NULL, "setheader", NULL, zkey, *h);
 									zval_ptr_dtor(h);
 								}
-							break;
+								break;
 							
 							default:
 								ZVAL_ADDREF(*header);
-								zend_call_method_with_2_params(&return_value, http_response_object_ce, NULL, "setheader", NULL, &zkey, *header);
+								zend_call_method_with_2_params(&return_value, http_response_object_ce, NULL, "setheader", NULL, zkey, *header);
 								zval_ptr_dtor(header);
-							break;
+								break;
 						}
-						key = NULL;
+						zval_ptr_dtor(&zkey);
 					}
 				}
 				
@@ -1308,12 +1228,12 @@ PHP_METHOD(HttpMessage, toMessageTypeObject)
 #else
 				http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot transform HttpMessage to HttpResponse (need PHP 5.1+)");
 #endif
+				break;
 			}
-			break;
 			
 			default:
 				http_error(HE_WARNING, HTTP_E_MESSAGE_TYPE, "HttpMessage is neither of type HttpMessage::TYPE_REQUEST nor HttpMessage::TYPE_RESPONSE");
-			break;
+				break;
 		}
 	}
 	SET_EH_NORMAL();
@@ -1321,11 +1241,7 @@ PHP_METHOD(HttpMessage, toMessageTypeObject)
 /* }}} */
 
 /* {{{ proto int HttpMessage::count()
- *
- * Implements Countable.
- * 
- * Returns the number of parent messages + 1.
- */
+	Implements Countable::count(). Returns the number of parent messages + 1. */
 PHP_METHOD(HttpMessage, count)
 {
 	NO_ARGS {
@@ -1339,11 +1255,7 @@ PHP_METHOD(HttpMessage, count)
 /* }}} */
 
 /* {{{ proto string HttpMessage::serialize()
- *
- * Implements Serializable.
- * 
- * Returns the serialized representation of the HttpMessage.
- */
+	Implements Serializable::serialize(). Returns the serialized representation of the HttpMessage. */
 PHP_METHOD(HttpMessage, serialize)
 {
 	NO_ARGS {
@@ -1358,11 +1270,7 @@ PHP_METHOD(HttpMessage, serialize)
 /* }}} */
 
 /* {{{ proto void HttpMessage::unserialize(string serialized)
- *
- * Implements Serializable.
- * 
- * Re-constructs the HttpMessage based upon the serialized string.
- */
+	Implements Serializable::unserialize(). Re-constructs the HttpMessage based upon the serialized string. */
 PHP_METHOD(HttpMessage, unserialize)
 {
 	int length;
@@ -1380,9 +1288,7 @@ PHP_METHOD(HttpMessage, unserialize)
 /* }}} */
 
 /* {{{ proto HttpMessage HttpMessage::detach(void)
- *
- * Returns a clone of an HttpMessage object detached from any parent messages.
- */
+	Returns a clone of an HttpMessage object detached from any parent messages. */
 PHP_METHOD(HttpMessage, detach)
 {
 	http_info info;
@@ -1404,29 +1310,35 @@ PHP_METHOD(HttpMessage, detach)
 }
 /* }}} */
 
-/* {{{ proto void HttpMessage::prepend(HttpMessage message)
- *
- * Prepends message(s) to the HTTP message.
- *
- * Expects an HttpMessage object as parameter.
- */
+/* {{{ proto void HttpMessage::prepend(HttpMessage message[, bool top = true])
+	Prepends message(s) to the HTTP message. Throws HttpInvalidParamException if the message is located within the same message chain. */
 PHP_METHOD(HttpMessage, prepend)
 {
 	zval *prepend;
 	zend_bool top = 1;
 	
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|b", &prepend, http_message_object_ce, &top)) {
+		http_message *msg[2];
+		getObject(http_message_object, obj);
+		getObjectEx(http_message_object, prepend_obj, prepend);
+		
+		/* safety check */
+		for (msg[0] = obj->message; msg[0]; msg[0] = msg[0]->parent) {
+			for (msg[1] = prepend_obj->message; msg[1]; msg[1] = msg[1]->parent) {
+				if (msg[0] == msg[1]) {
+					http_error(HE_THROW, HTTP_E_INVALID_PARAM, "Cannot prepend a message located within the same message chain");
+					return;
+				}
+			}
+		}
+		
 		http_message_object_prepend_ex(getThis(), prepend, top);
 	}
 }
 /* }}} */
 
 /* {{{ proto HttpMessage HttpMessage::reverse()
- *
- * Reorders the message chain in reverse order.
- *
- * Returns the most parent HttpMessage object.
- */
+	Reorders the message chain in reverse order. Returns the most parent HttpMessage object. */
 PHP_METHOD(HttpMessage, reverse)
 {
 	NO_ARGS {
@@ -1436,9 +1348,7 @@ PHP_METHOD(HttpMessage, reverse)
 /* }}} */
 
 /* {{{ proto void HttpMessage::rewind(void)
- *
- * Implements Iterator.
- */
+	Implements Iterator::rewind(). */
 PHP_METHOD(HttpMessage, rewind)
 {
 	NO_ARGS {
@@ -1454,9 +1364,7 @@ PHP_METHOD(HttpMessage, rewind)
 /* }}} */
 
 /* {{{ proto bool HttpMessage::valid(void)
- *
- * Implements Iterator.
- */
+	Implements Iterator::valid(). */
 PHP_METHOD(HttpMessage, valid)
 {
 	NO_ARGS {
@@ -1468,9 +1376,7 @@ PHP_METHOD(HttpMessage, valid)
 /* }}} */
 
 /* {{{ proto void HttpMessage::next(void)
- *
- * Implements Iterator.
- */
+	Implements Iterator::next(). */
 PHP_METHOD(HttpMessage, next)
 {
 	NO_ARGS {
@@ -1491,9 +1397,7 @@ PHP_METHOD(HttpMessage, next)
 /* }}} */
 
 /* {{{ proto int HttpMessage::key(void)
- *
- * Implements Iterator.
- */
+	Implements Iterator::key(). */
 PHP_METHOD(HttpMessage, key)
 {
 	NO_ARGS {
@@ -1505,9 +1409,7 @@ PHP_METHOD(HttpMessage, key)
 /* }}} */
 
 /* {{{ proto HttpMessage HttpMessage::current(void)
- *
- * Implements Iterator.
- */
+	Implements Iterator::current(). */
 PHP_METHOD(HttpMessage, current)
 {
 	NO_ARGS {