X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=495cd28759e0f5728713edfae56b7a9a23dba142;hp=5345b26112a0540cf804b159de2d8c513c25612b;hb=0e0def98a4ea4463bf8c21c6f161b2b37aa8c49d;hpb=120b03d9b12c4946391584e910d11713006f7018

diff --git a/http_message_object.c b/http_message_object.c
index 5345b26..495cd28 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)
@@ -56,6 +55,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 +99,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)
@@ -123,8 +131,6 @@ HTTP_BEGIN_ARGS(prepend, 1)
 HTTP_END_ARGS;
 HTTP_EMPTY_ARGS(reverse);
 
-#define http_message_object_declare_default_properties() _http_message_object_declare_default_properties(TSRMLS_C)
-static inline void _http_message_object_declare_default_properties(TSRMLS_D);
 #define http_message_object_read_prop _http_message_object_read_prop
 static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC);
 #define http_message_object_write_prop _http_message_object_write_prop
@@ -132,11 +138,13 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 #define http_message_object_get_props _http_message_object_get_props
 static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC);
 
+#define OBJ_PROP_CE http_message_object_ce
 zend_class_entry *http_message_object_ce;
 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)
@@ -152,6 +160,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)
@@ -186,8 +195,9 @@ static zend_object_handlers http_message_object_handlers;
 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);
@@ -195,20 +205,126 @@ PHP_MINIT_FUNCTION(http_message_object)
 #else
 	zend_class_implements(http_message_object_ce TSRMLS_CC, 1, zend_ce_iterator);
 #endif
-
-	HTTP_LONG_CONSTANT("HTTP_MSG_NONE", HTTP_MSG_NONE);
-	HTTP_LONG_CONSTANT("HTTP_MSG_REQUEST", HTTP_MSG_REQUEST);
-	HTTP_LONG_CONSTANT("HTTP_MSG_RESPONSE", HTTP_MSG_RESPONSE);
-
+	
 	http_message_object_handlers.clone_obj = _http_message_object_clone_obj;
 	http_message_object_handlers.read_property = http_message_object_read_prop;
 	http_message_object_handlers.write_property = http_message_object_write_prop;
 	http_message_object_handlers.get_properties = http_message_object_get_props;
 	http_message_object_handlers.get_property_ptr_ptr = NULL;
 	
+	DCL_PROP(PROTECTED, long, type, HTTP_MSG_NONE);
+	DCL_PROP(PROTECTED, string, body, "");
+	DCL_PROP(PROTECTED, string, requestMethod, "");
+	DCL_PROP(PROTECTED, string, requestUrl, "");
+	DCL_PROP(PROTECTED, string, responseStatus, "");
+	DCL_PROP(PROTECTED, long, responseCode, 0);
+	DCL_PROP_N(PROTECTED, httpVersion);
+	DCL_PROP_N(PROTECTED, headers);
+	DCL_PROP_N(PROTECTED, parentMessage);
+	
+#ifndef WONKY
+	DCL_CONST(long, "TYPE_NONE", HTTP_MSG_NONE);
+	DCL_CONST(long, "TYPE_REQUEST", HTTP_MSG_REQUEST);
+	DCL_CONST(long, "TYPE_RESPONSE", HTTP_MSG_RESPONSE);
+#endif
+	
+	HTTP_LONG_CONSTANT("HTTP_MSG_NONE", HTTP_MSG_NONE);
+	HTTP_LONG_CONSTANT("HTTP_MSG_REQUEST", HTTP_MSG_REQUEST);
+	HTTP_LONG_CONSTANT("HTTP_MSG_RESPONSE", HTTP_MSG_RESPONSE);
+	
 	return SUCCESS;
 }
 
+void _http_message_object_reverse(zval *this_ptr, zval *return_value TSRMLS_DC)
+{
+	int i;
+	getObject(http_message_object, obj);
+	
+	/* count */
+	http_message_count(i, obj->message);
+	
+	if (i > 1) {
+		zval o;
+		zend_object_value *ovalues = NULL;
+		http_message_object **objects = NULL;
+		int last = i - 1;
+		
+		objects = ecalloc(i, sizeof(http_message_object *));
+		ovalues = ecalloc(i, sizeof(zend_object_value));
+	
+		/* we are the first message */
+		objects[0] = obj;
+		ovalues[0] = getThis()->value.obj;
+	
+		/* fetch parents */
+		INIT_PZVAL(&o);
+		o.type = IS_OBJECT;
+		for (i = 1; obj->parent.handle; ++i) {
+			o.value.obj = obj->parent;
+			ovalues[i] = o.value.obj;
+			objects[i] = obj = zend_object_store_get_object(&o TSRMLS_CC);
+		}
+		
+		/* reorder parents */
+		for (last = --i; i; --i) {
+			objects[i]->message->parent = objects[i-1]->message;
+			objects[i]->parent = ovalues[i-1];
+		}
+		objects[0]->message->parent = NULL;
+		objects[0]->parent.handle = 0;
+		objects[0]->parent.handlers = NULL;
+		
+		/* add ref (why?) */
+		Z_OBJ_ADDREF_P(getThis());
+		RETVAL_OBJVAL(ovalues[last], 1);
+		
+		efree(objects);
+		efree(ovalues);
+	} else {
+		RETURN_ZVAL(getThis(), 1, 0);
+	}
+}
+
+void _http_message_object_prepend_ex(zval *this_ptr, zval *prepend, zend_bool top TSRMLS_DC)
+{
+	zval m;
+	http_message *save_parent_msg = NULL;
+	zend_object_value save_parent_obj = {0, NULL};
+	getObject(http_message_object, obj);
+	getObjectEx(http_message_object, prepend_obj, prepend);
+		
+	INIT_PZVAL(&m);
+	m.type = IS_OBJECT;
+		
+	if (!top) {
+		save_parent_obj = obj->parent;
+		save_parent_msg = obj->message->parent;
+	} else {
+		/* iterate to the most parent object */
+		while (obj->parent.handle) {
+			m.value.obj = obj->parent;
+			obj = zend_object_store_get_object(&m TSRMLS_CC);
+		}
+	}
+		
+	/* prepend */
+	obj->parent = prepend->value.obj;
+	obj->message->parent = prepend_obj->message;
+		
+	/* add ref */
+	zend_objects_store_add_ref(prepend TSRMLS_CC);
+	while (prepend_obj->parent.handle) {
+		m.value.obj = prepend_obj->parent;
+		zend_objects_store_add_ref(&m TSRMLS_CC);
+		prepend_obj = zend_object_store_get_object(&m TSRMLS_CC);
+	}
+		
+	if (!top) {
+		prepend_obj->parent = save_parent_obj;
+		prepend_obj->message->parent = save_parent_msg;
+	}
+}
+
 zend_object_value _http_message_object_new(zend_class_entry *ce TSRMLS_DC)
 {
 	return http_message_object_new_ex(ce, NULL, NULL);
@@ -234,7 +350,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;
@@ -244,39 +361,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);
-}
-
-static inline void _http_message_object_declare_default_properties(TSRMLS_D)
-{
-	zend_class_entry *ce = http_message_object_ce;
-
-#ifndef WONKY
-	DCL_CONST(long, "TYPE_NONE", HTTP_MSG_NONE);
-	DCL_CONST(long, "TYPE_REQUEST", HTTP_MSG_REQUEST);
-	DCL_CONST(long, "TYPE_RESPONSE", HTTP_MSG_RESPONSE);
-#endif
-
-	DCL_PROP(PROTECTED, long, type, HTTP_MSG_NONE);
-	DCL_PROP(PROTECTED, string, body, "");
-	DCL_PROP(PROTECTED, string, requestMethod, "");
-	DCL_PROP(PROTECTED, string, requestUrl, "");
-	DCL_PROP(PROTECTED, string, responseStatus, "");
-	DCL_PROP(PROTECTED, long, responseCode, 0);
-	DCL_PROP_N(PROTECTED, httpVersion);
-	DCL_PROP_N(PROTECTED, headers);
-	DCL_PROP_N(PROTECTED, parentMessage);
+	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);
@@ -289,7 +387,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)
@@ -325,24 +423,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:
@@ -351,7 +449,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:
@@ -360,7 +458,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:
@@ -369,7 +467,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:
@@ -378,7 +476,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:
@@ -387,7 +485,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 			} else {
 				RETVAL_NULL();
 			}
-		break;
+			break;
 		
 		default:
 #ifdef WONKY
@@ -395,7 +493,6 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 #else
 			RETVAL_NULL();
 #endif
-		break;
 	}
 
 	return return_value;
@@ -429,27 +526,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:
@@ -462,7 +559,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:
@@ -470,7 +567,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:
@@ -478,7 +575,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:
@@ -486,7 +583,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:
@@ -494,13 +591,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);
 }
@@ -511,7 +608,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);
 
@@ -536,21 +633,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:
@@ -558,7 +654,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);
@@ -566,6 +662,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);
 }
@@ -660,7 +764,7 @@ 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);
 	}
@@ -687,6 +791,31 @@ PHP_METHOD(HttpMessage, setBody)
 }
 /* }}} */
 
+/* {{{ proto string HttpMessage::getHeader(string header)
+ *
+ * Get message header.
+ *
+ * Returns the header value on success or NULL if the header does not exist.
+ */
+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.
@@ -697,13 +826,11 @@ 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));
 	}
 }
 /* }}} */
@@ -717,16 +844,17 @@ PHP_METHOD(HttpMessage, getHeaders)
  */
 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);
+	}
 }
 /* }}} */
 
@@ -742,7 +870,7 @@ PHP_METHOD(HttpMessage, setHeaders)
  */
 PHP_METHOD(HttpMessage, addHeaders)
 {
-	zval old_headers, *new_headers;
+	zval *new_headers;
 	zend_bool append = 0;
 	getObject(http_message_object, obj);
 
@@ -750,12 +878,7 @@ 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);
 }
 /* }}} */
 
@@ -769,7 +892,7 @@ PHP_METHOD(HttpMessage, getType)
 {
 	NO_ARGS;
 
-	IF_RETVAL_USED {
+	if (return_value_used) {
 		getObject(http_message_object, obj);
 		RETURN_LONG(obj->message->type);
 	}
@@ -805,7 +928,7 @@ 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);
@@ -853,7 +976,7 @@ 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);
@@ -897,7 +1020,7 @@ 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);
@@ -929,8 +1052,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;
 	}
 
@@ -950,7 +1073,7 @@ 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);
@@ -997,7 +1120,7 @@ PHP_METHOD(HttpMessage, getHttpVersion)
 {
 	NO_ARGS;
 
-	IF_RETVAL_USED {
+	if (return_value_used) {
 		char ver[4] = {0};
 		getObject(http_message_object, obj);
 
@@ -1037,25 +1160,62 @@ 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.
+ * 
+ * Expects a string parameter specifying the magic.mime database to use.
+ * Additionally accepts an optional int parameter, being flags for libmagic.
+ * 
+ * Returns the guessed content type on success, or FALSE on failure.
+ * 
+ * Throws HttpRuntimeException, HttpInvalidParamException 
+ * if http.only_exceptions is TRUE.
+ */
+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 HttpRuntimeException.
  */
 PHP_METHOD(HttpMessage, getParentMessage)
 {
-	NO_ARGS;
-
-	IF_RETVAL_USED {
+	SET_EH_THROW_HTTP();
+	NO_ARGS {
 		getObject(http_message_object, obj);
 
 		if (obj->message->parent) {
 			RETVAL_OBJVAL(obj->parent, 1);
 		} else {
-			RETVAL_NULL();
+			http_error(HE_WARNING, HTTP_E_RUNTIME, "HttpMessage does not have a parent message");
 		}
 	}
+	SET_EH_NORMAL();
 }
 /* }}} */
 
@@ -1087,7 +1247,7 @@ PHP_METHOD(HttpMessage, send)
  */
 PHP_METHOD(HttpMessage, toString)
 {
-	IF_RETVAL_USED {
+	if (return_value_used) {
 		char *string;
 		size_t length;
 		zend_bool include_parent = 0;
@@ -1121,17 +1281,16 @@ PHP_METHOD(HttpMessage, toMessageTypeObject)
 	
 	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);
@@ -1139,6 +1298,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);
@@ -1154,8 +1314,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);
@@ -1168,16 +1327,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) {
@@ -1186,31 +1343,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);
 					}
 				}
 				
@@ -1221,12 +1377,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();
@@ -1317,11 +1473,13 @@ PHP_METHOD(HttpMessage, detach)
 }
 /* }}} */
 
-/* {{{ proto void HttpMessage::prepend(HttpMessage message)
+/* {{{ proto void HttpMessage::prepend(HttpMessage message[, bool top = true])
  *
  * Prepends message(s) to the HTTP message.
  *
  * Expects an HttpMessage object as parameter.
+ *
+ * Throws HttpInvalidParamException if the message is located within the same message chain.
  */
 PHP_METHOD(HttpMessage, prepend)
 {
@@ -1329,42 +1487,21 @@ PHP_METHOD(HttpMessage, prepend)
 	zend_bool top = 1;
 	
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|b", &prepend, http_message_object_ce, &top)) {
-		zval m;
-		http_message *save_parent_msg;
-		zend_object_value save_parent_obj;
+		http_message *msg[2];
 		getObject(http_message_object, obj);
 		getObjectEx(http_message_object, prepend_obj, prepend);
 		
-		INIT_PZVAL(&m);
-		m.type = IS_OBJECT;
-		
-		if (!top) {
-			save_parent_obj = obj->parent;
-			save_parent_msg = obj->message->parent;
-		} else {
-			/* iterate to the most parent object */
-			while (obj->parent.handle) {
-				m.value.obj = obj->parent;
-				obj = zend_object_store_get_object(&m TSRMLS_CC);
+		/* 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;
+				}
 			}
 		}
 		
-		/* prepend */
-		obj->parent = prepend->value.obj;
-		obj->message->parent = prepend_obj->message;
-		
-		/* add ref */
-		zend_objects_store_add_ref(prepend TSRMLS_CC);
-		while (prepend_obj->parent.handle) {
-			m.value.obj = prepend_obj->parent;
-			zend_objects_store_add_ref(&m TSRMLS_CC);
-			prepend_obj = zend_object_store_get_object(&m TSRMLS_CC);
-		}
-		
-		if (!top) {
-			prepend_obj->parent = save_parent_obj;
-			prepend_obj->message->parent = save_parent_msg;
-		}
+		http_message_object_prepend_ex(getThis(), prepend, top);
 	}
 }
 /* }}} */
@@ -1377,53 +1514,8 @@ PHP_METHOD(HttpMessage, prepend)
  */
 PHP_METHOD(HttpMessage, reverse)
 {
-	int i;
-	getObject(http_message_object, obj);
-	
-	NO_ARGS;
-	
-	/* count */
-	http_message_count(i, obj->message);
-	
-	if (i > 1) {
-		zval o;
-		zend_object_value *ovalues = NULL;
-		http_message_object **objects = NULL;
-		int last = i - 1;
-		
-		objects = ecalloc(i, sizeof(http_message_object *));
-		ovalues = ecalloc(i, sizeof(zend_object_value));
-	
-		/* we are the first message */
-		objects[0] = obj;
-		ovalues[0] = getThis()->value.obj;
-	
-		/* fetch parents */
-		INIT_PZVAL(&o);
-		o.type = IS_OBJECT;
-		for (i = 1; obj->parent.handle; ++i) {
-			o.value.obj = obj->parent;
-			ovalues[i] = o.value.obj;
-			objects[i] = obj = zend_object_store_get_object(&o TSRMLS_CC);
-		}
-		
-		/* reorder parents */
-		for (last = --i; i; --i) {
-			objects[i]->message->parent = objects[i-1]->message;
-			objects[i]->parent = ovalues[i-1];
-		}
-		objects[0]->message->parent = NULL;
-		objects[0]->parent.handle = 0;
-		objects[0]->parent.handlers = NULL;
-		
-		/* add ref (why?) */
-		Z_OBJ_ADDREF_P(getThis());
-		RETVAL_OBJVAL(ovalues[last], 1);
-		
-		efree(objects);
-		efree(ovalues);
-	} else {
-		RETURN_ZVAL(getThis(), 1, 0);
+	NO_ARGS {
+		http_message_object_reverse(getThis(), return_value);
 	}
 }
 /* }}} */