X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_methods.c;h=458871834dc8b4dd6fc081a1276e031fd6f538af;hp=23631c5c6c4a04823c7e3b02dedfac195dd37034;hb=bb6571e22d14c87114eb729145be2e7b87ebea42;hpb=325520da64f5ae1ecea2f7395fc808ade28da9ea

diff --git a/http_methods.c b/http_methods.c
index 23631c5..4588718 100644
--- a/http_methods.c
+++ b/http_methods.c
@@ -20,13 +20,16 @@
 #endif
 
 #include "php.h"
+#include "php_streams.h"
+
 #include "php_http.h"
 #include "php_http_std_defs.h"
 #include "php_http_api.h"
 #include "php_http_cache_api.h"
-#include "php_http_curl_api.h"
+#include "php_http_request_api.h"
 #include "php_http_date_api.h"
 #include "php_http_headers_api.h"
+#include "php_http_message_api.h"
 #include "php_http_send_api.h"
 #include "php_http_url_api.h"
 
@@ -152,7 +155,7 @@ PHP_METHOD(HttpResponse, setCacheControl)
 	}
 
 	if ((!raw) && (strcmp(ccontrol, "public") && strcmp(ccontrol, "private") && strcmp(ccontrol, "no-cache"))) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cache-Control '%s' doesn't match public, private or no-cache", ccontrol);
+		http_error_ex(E_WARNING, HTTP_E_PARAM, "Cache-Control '%s' doesn't match public, private or no-cache", ccontrol);
 		RETURN_FALSE;
 	}
 
@@ -193,8 +196,7 @@ PHP_METHOD(HttpResponse, setContentType)
 	}
 
 	if (!strchr(ctype, '/')) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,
-			"Content type '%s' doesn't seem to contain a primary and a secondary part", ctype);
+		http_error_ex(E_WARNING, HTTP_E_PARAM, "Content type '%s' doesn't seem to contain a primary and a secondary part", ctype);
 		RETURN_FALSE;
 	}
 
@@ -317,13 +319,13 @@ PHP_METHOD(HttpResponse, setData)
 	zval *the_data;
 	getObject(http_response_object, obj);
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &the_data)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &the_data)) {
 		RETURN_FALSE;
 	}
 
 	convert_to_string_ex(&the_data);
 	SET_PROP(obj, data, the_data);
-	UPD_PROP(obj, long, lastModified, http_lmod(the_data, SEND_DATA));
+	UPD_PROP(obj, long, lastModified, http_last_modified(the_data, SEND_DATA));
 	UPD_PROP(obj, long, send_mode, SEND_DATA);
 	RETURN_TRUE;
 }
@@ -362,7 +364,7 @@ PHP_METHOD(HttpResponse, setStream)
 	php_stream_from_zval(the_real_stream, &the_stream);
 
 	SET_PROP(obj, stream, the_stream);
-	UPD_PROP(obj, long, lastModified, http_lmod(the_real_stream, SEND_RSRC));
+	UPD_PROP(obj, long, lastModified, http_last_modified(the_real_stream, SEND_RSRC));
 	UPD_PROP(obj, long, send_mode, SEND_RSRC);
 	RETURN_TRUE;
 }
@@ -400,7 +402,7 @@ PHP_METHOD(HttpResponse, setFile)
 	convert_to_string_ex(&the_file);
 
 	UPD_PROP(obj, string, file, Z_STRVAL_P(the_file));
-	UPD_PROP(obj, long, lastModified, http_lmod(the_file, -1));
+	UPD_PROP(obj, long, lastModified, http_last_modified(the_file, -1));
 	UPD_PROP(obj, long, send_mode, -1);
 	RETURN_TRUE;
 }
@@ -523,7 +525,7 @@ PHP_METHOD(HttpResponse, send)
 
 /* {{{ HttpMessage */
 
-/* {{{ static HttpMessage HttpMessage::fromString(string raw_message)
+/* {{{ proto static HttpMessage HttpMessage::fromString(string raw_message)
  *
  * Create an HttpMessage object from a string.
  */
@@ -532,6 +534,7 @@ PHP_METHOD(HttpMessage, fromString)
 	char *string = NULL;
 	int length = 0;
 	http_message *msg = NULL;
+	http_message_object obj;
 
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &string, &length)) {
 		RETURN_NULL();
@@ -546,135 +549,239 @@ PHP_METHOD(HttpMessage, fromString)
 }
 /* }}} */
 
-/* {{{ void HttpMessage::__construct([string raw_message])
+/* {{{ proto void HttpMessage::__construct([string message])
  *
- * Instantiate a new HttpMessage object based on the optionally provided
- * raw message.  An HTTP Message can be either a response or a request.
+ * Instantiate a new HttpMessage object.
  */
 PHP_METHOD(HttpMessage, __construct)
 {
-	zval *message = NULL;
+	char *message = NULL;
+	int length = 0;
 	getObject(http_message_object, obj);
 
 	SET_EH_THROW_HTTP();
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z/", &message)) {
-		if (message) {
-			convert_to_string(message);
-			SET_PROP(obj, raw, message);
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &message, &length) && message && length) {
+		if (obj->message = http_message_parse(message, length)) {
+			if (obj->message->parent) {
+				obj->parent = http_message_object_from_msg(obj->message->parent);
+			}
 		}
+	} else if (!obj->message) {
+		obj->message = http_message_new();
 	}
 	SET_EH_NORMAL();
 }
 /* }}} */
 
-/* {{{ void HttpMessage::setRaw(string raw_message)
+/* {{{ proto string HttpMessage::getBody()
  *
- * Parse a new raw message.
+ * Get the body of the parsed Message.
  */
-PHP_METHOD(HttpMessage, setRaw)
+PHP_METHOD(HttpMessage, getBody)
 {
-	zval *message;
+	zval *body;
 	getObject(http_message_object, obj);
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &message)) {
-		return;
-	}
+	NO_ARGS;
 
-	convert_to_string(message);
-	SET_PROP(obj, raw, message);
+	RETURN_PHPSTR(&obj->message->body, PHPSTR_FREE_NOT, 1);
 }
 /* }}} */
 
-/* {{{ string HttpMessage::getBody()
+/* {{{ proto array HttpMessage::getHeaders()
  *
- * Get the body of the parsed Message.
+ * Get Message Headers.
  */
-PHP_METHOD(HttpMessage, getBody)
+PHP_METHOD(HttpMessage, getHeaders)
 {
-	zval *body;
+	zval headers;
 	getObject(http_message_object, obj);
 
 	NO_ARGS;
 
-	body = GET_PROP(obj, body);
-	RETURN_STRINGL(Z_STRVAL_P(body), Z_STRLEN_P(body), 1);
+	Z_ARRVAL(headers) = &obj->message->hdrs;
+	array_init(return_value);
+	array_copy(&headers, return_value);
 }
 /* }}} */
 
-/* {{{ array HttpMessage::getHeaders()
+/* {{{ proto void HttpMessage::setHeaders(array headers)
  *
- * Get Message Headers.
+ * Sets new headers.
  */
-PHP_METHOD(HttpMessage, getHeaders)
+PHP_METHOD(HttpMessage, setHeaders)
 {
-	zval *headers;
+	zval *new_headers, old_headers;
 	getObject(http_message_object, obj);
 
-	NO_ARGS;
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &new_headers)) {
+		return;
+	}
 
-	headers = GET_PROP(obj, headers);
-	array_init(return_value);
-	array_copy(headers, return_value);
+	zend_hash_clean(&obj->message->hdrs);
+	Z_ARRVAL(old_headers) = &obj->message->hdrs;
+	array_copy(new_headers, &old_headers);
+}
+/* }}} */
+
+/* {{{ 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.
+ */
+PHP_METHOD(HttpMessage, addHeaders)
+{
+	zval old_headers, *new_headers;
+	zend_bool append = 0;
+	getObject(http_message_object, obj);
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|b", &new_headers, &append)) {
+		return;
+	}
+
+	Z_ARRVAL(old_headers) = &obj->message->hdrs;
+	if (append) {
+		array_append(new_headers, &old_headers);
+	} else {
+		array_merge(new_headers, &old_headers);
+	}
 }
 /* }}} */
 
-/* {{{ long HttpMessage::getType()
+/* {{{ proto long HttpMessage::getType()
  *
  * Get Message Type. (HTTP_MSG_NONE|HTTP_MSG_REQUEST|HTTP_MSG_RESPONSE)
  */
 PHP_METHOD(HttpMessage, getType)
 {
-	zval *type;
 	getObject(http_message_object, obj);
 
 	NO_ARGS;
 
-	type = GET_PROP(obj, type);
-	RETURN_LONG(Z_LVAL_P(type));
+	RETURN_LONG(obj->message->type);
+}
+/* }}} */
+
+/* {{{ proto void HttpMessage::setType(long type)
+ *
+ * Set Message Type. (HTTP_MSG_NONE|HTTP_MSG_REQUEST|HTTP_MSG_RESPONSE)
+ */
+PHP_METHOD(HttpMessage, setType)
+{
+	long type;
+	getObject(http_message_object, obj);
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &type)) {
+		return;
+	}
+	http_message_set_type(obj->message, type);
 }
 /* }}} */
 
-/* {{{ int HttpMessage::getResponseCode()
+/* {{{ proto long HttpMessage::getResponseCode()
  *
  * Get the Response Code of the Message.
  */
 PHP_METHOD(HttpMessage, getResponseCode)
 {
-	zval *status;
 	getObject(http_message_object, obj);
 
 	NO_ARGS;
 
-	if (obj->message->type != HTTP_MSG_RESPONSE) {
+	if (!HTTP_MSG_TYPE(RESPONSE, obj->message)) {
+		http_error(E_NOTICE, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_RESPONSE");
 		RETURN_NULL();
 	}
 
-	status = GET_PROP(obj, responseCode);
-	RETURN_LONG(Z_LVAL_P(status));
+	RETURN_LONG(obj->message->info.response.code);
 }
 /* }}} */
 
-/* {{{ string HttpMessage::getRequestMethod()
+/* {{{ proto bool HttpMessage::setResponseCode(long code)
+ *
+ * Set the response code of an HTTP Response Message.
+ * Returns false if the Message is not of type HTTP_MSG_RESPONSE,
+ * or if the response code is out of range (100-510).
+ */
+PHP_METHOD(HttpMessage, setResponseCode)
+{
+	long code;
+	getObject(http_message_object, obj);
+
+	if (obj->message->type != HTTP_MSG_RESPONSE) {
+		http_error(E_WARNING, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_RESPONSE");
+		RETURN_FALSE;
+	}
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) {
+		RETURN_FALSE;
+	}
+	if (code < 100 || code > 510) {
+		http_error_ex(E_WARNING, HTTP_E_PARAM, "Invalid response code (100-510): %ld", code);
+		RETURN_FALSE;
+	}
+
+	obj->message->info.response.code = code;
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto string HttpMessage::getRequestMethod()
  *
  * Get the Request Method of the Message.
+ * Returns false if the Message is not of type HTTP_MSG_REQUEST.
  */
 PHP_METHOD(HttpMessage, getRequestMethod)
 {
-	zval *method;
 	getObject(http_message_object, obj);
 
 	NO_ARGS;
 
 	if (obj->message->type != HTTP_MSG_REQUEST) {
+		http_error(E_NOTICE, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_REQUEST");
 		RETURN_NULL();
 	}
 
-	method = GET_PROP(obj, requestMethod);
-	RETURN_STRINGL(Z_STRVAL_P(method), Z_STRLEN_P(method), 1);
+	RETURN_STRING(obj->message->info.request.method, 1);
 }
 /* }}} */
 
-/* {{{ string HttpMessage::getRequestUri()
+/* {{{ proto bool HttpMessage::setRequestMethod(string method)
+ *
+ * Set the Request Method of the HTTP Message.
+ * Returns false if the Message is not of type HTTP_MSG_REQUEST.
+ */
+PHP_METHOD(HttpMessage, setRequestMethod)
+{
+	char *method;
+	int method_len;
+	getObject(http_message_object, obj);
+
+	if (obj->message->type != HTTP_MSG_REQUEST) {
+		http_error(E_WARNING, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_REQUEST");
+		RETURN_FALSE;
+	}
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &method, &method_len)) {
+		RETURN_FALSE;
+	}
+	if (method_len < 1) {
+		http_error(E_WARNING, HTTP_E_PARAM, "Cannot set HttpMessage::requestMethod to an empty string");
+		RETURN_FALSE;
+	}
+	if (SUCCESS != http_check_method(method)) {
+		http_error_ex(E_WARNING, HTTP_E_PARAM, "Unkown request method: %s", method);
+		RETURN_FALSE;
+	}
+
+	if (obj->message->info.request.method) {
+		efree(obj->message->info.request.method);
+	}
+	obj->message->info.request.method = estrndup(method, method_len);
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto string HttpMessage::getRequestUri()
  *
  * Get the Request URI of the Message.
  */
@@ -686,38 +793,146 @@ PHP_METHOD(HttpMessage, getRequestUri)
 	NO_ARGS;
 
 	if (obj->message->type != HTTP_MSG_REQUEST) {
+		http_error(E_WARNING, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_REQUEST");
 		RETURN_NULL();
 	}
 
-	uri = GET_PROP(obj, requestUri);
-	RETURN_STRINGL(Z_STRVAL_P(uri), Z_STRLEN_P(uri), 1);
+	RETURN_STRING(obj->message->info.request.URI, 1);
 }
 /* }}} */
 
-/* {{{ string HttpMessage::getHttpVersion()
+/* {{{ proto bool HttpMessage::setRequestUri(string URI)
+ *
+ * Set the Request URI of the HTTP Message.
+ * Returns false if the Message is not of type HTTP_MSG_REQUEST,
+ * or if paramtere URI was empty.
+ */
+PHP_METHOD(HttpMessage, setRequestUri)
+{
+	char *URI;
+	int URIlen;
+	getObject(http_message_object, obj);
+
+	if (obj->message->type != HTTP_MSG_REQUEST) {
+		http_error(E_WARNING, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_REQUEST");
+		RETURN_FALSE;
+	}
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &URI, &URIlen)) {
+		RETURN_FALSE;
+	}
+	if (URIlen < 1) {
+		http_error(E_WARNING, HTTP_E_PARAM, "Cannot set HttpMessage::requestUri to an empty string");
+		RETURN_FALSE;
+	}
+
+	if (obj->message->info.request.URI) {
+		efree(obj->message->info.request.URI);
+	}
+	obj->message->info.request.URI = estrndup(URI, URIlen);
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto string HttpMessage::getHttpVersion()
  *
  * Get the HTTP Protocol Version of the Message.
  */
 PHP_METHOD(HttpMessage, getHttpVersion)
 {
-	zval *version;
 	char ver[4] = {0};
+	float version;
 	getObject(http_message_object, obj);
 
 	NO_ARGS;
 
-	version = GET_PROP(obj, httpVersion);
+	switch (obj->message->type)
+	{
+		case HTTP_MSG_RESPONSE:
+			version = obj->message->info.response.http_version;
+		break;
 
-	if (Z_TYPE_P(version) == IS_NULL) {
-		RETURN_NULL();
+		case HTTP_MSG_REQUEST:
+			version = obj->message->info.request.http_version;
+		break;
+
+		case HTTP_MSG_NONE:
+		default:
+			RETURN_NULL();
 	}
-	
-	sprintf(ver, "1.1f", Z_DVAL_P(version));
+	sprintf(ver, "%1.1f", version);
 	RETURN_STRINGL(ver, 3, 1);
 }
 /* }}} */
 
-/* {{{ string HttpMessage::toString()
+/* {{{ proto bool HttpMessage::setHttpVersion(string version)
+ *
+ * Set the HTTP Protocol version of the Message.
+ * Returns false if version is invalid (1.0 and 1.1).
+ */
+PHP_METHOD(HttpMessage, setHttpVersion)
+{
+	char v[4];
+	zval *zv, *version;
+	getObject(http_message_object, obj);
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &zv)) {
+		return;
+	}
+
+	if (obj->message->type == HTTP_MSG_NONE) {
+		http_error(E_WARNING, HTTP_E_MSG, "Message is neither of type HTTP_MSG_RESPONSE nor HTTP_MSG_REQUEST");
+		RETURN_FALSE;
+	}
+
+	convert_to_double_ex(&zv);
+	sprintf(v, "%1.1f", Z_DVAL_P(zv));
+	if (strcmp(v, "1.0") && strcmp(v, "1.1")) {
+		http_error_ex(E_WARNING, HTTP_E_PARAM, "Invalid HTTP protocol version (1.0 or 1.1): %s", v);
+		RETURN_FALSE;
+	}
+
+	if (obj->message->type == HTTP_MSG_RESPONSE) {
+		obj->message->info.response.http_version = (float) Z_DVAL_P(zv);
+	} else {
+		obj->message->info.request.http_version = (float) Z_DVAL_P(zv);
+	}
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto HttpMessage HttpMessage::getParentMessage()
+ *
+ * Get parent Message.
+ */
+PHP_METHOD(HttpMessage, getParentMessage)
+{
+	getObject(http_message_object, obj);
+
+	NO_ARGS;
+
+	if (obj->message->parent) {
+		RETVAL_OBJVAL(obj->parent);
+	} else {
+		RETVAL_NULL();
+	}
+}
+/* }}} */
+
+/* {{{ proto bool HttpMessage::send()
+ *
+ * Send the Message according to its type as Response or Request.
+ */
+PHP_METHOD(HttpMessage, send)
+{
+	getObject(http_message_object, obj);
+
+	NO_ARGS;
+
+	RETURN_SUCCESS(http_message_send(obj->message));
+}
+/* }}} */
+
+/* {{{ proto string HttpMessage::toString([bool include_parent = true])
  *
  * Get the string representation of the Message.
  */
@@ -725,11 +940,18 @@ PHP_METHOD(HttpMessage, toString)
 {
 	char *string;
 	size_t length;
+	zend_bool include_parent = 1;
 	getObject(http_message_object, obj);
-	
-	NO_ARGS;
-	
-	http_message_tostring(obj->message, &string, &length);
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &include_parent)) {
+		RETURN_FALSE;
+	}
+
+	if (include_parent) {
+		http_message_serialize(obj->message, &string, &length);
+	} else {
+		http_message_tostring(obj->message, &string, &length);
+	}
 	RETURN_STRINGL(string, length, 0);
 }
 /* }}} */
@@ -756,7 +978,7 @@ PHP_METHOD(HttpRequest, __construct)
 		INIT_PARR(obj, options);
 		INIT_PARR(obj, responseInfo);
 		INIT_PARR(obj, responseData);
-		INIT_PARR(obj, postData);
+		INIT_PARR(obj, postFields);
 		INIT_PARR(obj, postFiles);
 
 		if (URL) {
@@ -783,7 +1005,7 @@ PHP_METHOD(HttpRequest, __destruct)
 	FREE_PARR(obj, options);
 	FREE_PARR(obj, responseInfo);
 	FREE_PARR(obj, responseData);
-	FREE_PARR(obj, postData);
+	FREE_PARR(obj, postFields);
 	FREE_PARR(obj, postFiles);
 }
 /* }}} */
@@ -1139,9 +1361,7 @@ PHP_METHOD(HttpRequest, setContentType)
 	}
 
 	if (!strchr(ctype, '/')) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,
-			"Content-Type '%s' doesn't seem to contain a primary and a secondary part",
-			ctype);
+		http_error_ex(E_WARNING, HTTP_E_PARAM, "Content-Type '%s' doesn't seem to contain a primary and a secondary part", ctype);
 		RETURN_FALSE;
 	}
 
@@ -1256,12 +1476,12 @@ PHP_METHOD(HttpRequest, unsetQueryData)
 }
 /* }}} */
 
-/* {{{ proto bool HttpRequest::addPostData(array post_data)
+/* {{{ proto bool HttpRequest::addPostFields(array post_data)
  *
  * Adds POST data entries.
  * Affects only POST requests.
  */
-PHP_METHOD(HttpRequest, addPostData)
+PHP_METHOD(HttpRequest, addPostFields)
 {
 	zval *post, *post_data;
 	getObject(http_request_object, obj);
@@ -1270,20 +1490,20 @@ PHP_METHOD(HttpRequest, addPostData)
 		RETURN_FALSE;
 	}
 
-	post = GET_PROP(obj, postData);
+	post = GET_PROP(obj, postFields);
 	array_merge(post_data, post);
 
 	RETURN_TRUE;
 }
 /* }}} */
 
-/* {{{ proto bool HttpRequest::setPostData(array post_data)
+/* {{{ proto bool HttpRequest::setPostFields(array post_data)
  *
  * Set the POST data entries.
  * Overwrites previously set POST data.
  * Affects only POST requests.
  */
-PHP_METHOD(HttpRequest, setPostData)
+PHP_METHOD(HttpRequest, setPostFields)
 {
 	zval *post, *post_data;
 	getObject(http_request_object, obj);
@@ -1292,7 +1512,7 @@ PHP_METHOD(HttpRequest, setPostData)
 		RETURN_FALSE;
 	}
 
-	post = GET_PROP(obj, postData);
+	post = GET_PROP(obj, postFields);
 	zend_hash_clean(Z_ARRVAL_P(post));
 	array_copy(post_data, post);
 
@@ -1300,36 +1520,36 @@ PHP_METHOD(HttpRequest, setPostData)
 }
 /* }}}*/
 
-/* {{{ proto array HttpRequest::getPostData()
+/* {{{ proto array HttpRequest::getPostFields()
  *
  * Get previously set POST data.
  */
-PHP_METHOD(HttpRequest, getPostData)
+PHP_METHOD(HttpRequest, getPostFields)
 {
 	zval *post_data;
 	getObject(http_request_object, obj);
 
 	NO_ARGS;
 
-	post_data = GET_PROP(obj, postData);
+	post_data = GET_PROP(obj, postFields);
 	array_init(return_value);
 	array_copy(post_data, return_value);
 }
 /* }}} */
 
-/* {{{ proto void HttpRequest::unsetPostData()
+/* {{{ proto void HttpRequest::unsetPostFields()
  *
  * Clean POST data entires.
  * Affects only POST requests.
  */
-PHP_METHOD(HttpRequest, unsetPostData)
+PHP_METHOD(HttpRequest, unsetPostFields)
 {
 	zval *post_data;
 	getObject(http_request_object, obj);
 
 	NO_ARGS;
 
-	post_data = GET_PROP(obj, postData);
+	post_data = GET_PROP(obj, postFields);
 	zend_hash_clean(Z_ARRVAL_P(post_data));
 }
 /* }}} */
@@ -1352,7 +1572,7 @@ PHP_METHOD(HttpRequest, addPostFile)
 
 	if (type_len) {
 		if (!strchr(type, '/')) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Content-Type '%s' doesn't seem to contain a primary and a secondary part", type);
+			http_error_ex(E_WARNING, HTTP_E_PARAM, "Content-Type '%s' doesn't seem to contain a primary and a secondary part", type);
 			RETURN_FALSE;
 		}
 	} else {
@@ -1570,19 +1790,13 @@ PHP_METHOD(HttpRequest, getResponseBody)
  */
 PHP_METHOD(HttpRequest, getResponseCode)
 {
-	zval **code, **hdrs, *data;
+	zval *code;
 	getObject(http_request_object, obj);
 
 	NO_ARGS;
 
-	data = GET_PROP(obj, responseData);
-	if (	(SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &hdrs)) &&
-			(SUCCESS == zend_hash_find(Z_ARRVAL_PP(hdrs), "Response Status", sizeof("Response Status"), (void **) &code))) {
-		RETVAL_STRINGL(Z_STRVAL_PP(code), Z_STRLEN_PP(code), 1);
-		convert_to_long(return_value);
-	} else {
-		RETURN_FALSE;
-	}
+	code = GET_PROP(obj, responseCode);
+	RETURN_LONG(Z_LVAL_P(code));
 }
 /* }}} */
 
@@ -1608,7 +1822,7 @@ PHP_METHOD(HttpRequest, getResponseInfo)
 		if (SUCCESS == zend_hash_find(Z_ARRVAL_P(info), pretty_key(info_name, info_len, 0, 0), info_len + 1, (void **) &infop)) {
 			RETURN_ZVAL(*infop, 1, ZVAL_PTR_DTOR);
 		} else {
-			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not find response info named %s", info_name);
+			http_error_ex(E_NOTICE, HTTP_E_PARAM, "Could not find response info named %s", info_name);
 			RETURN_FALSE;
 		}
 	} else {
@@ -1618,6 +1832,24 @@ PHP_METHOD(HttpRequest, getResponseInfo)
 }
 /* }}}*/
 
+/* {{{ proto HttpMessage HttpRequest::getResponseMessage()
+ *
+ * Get the full response as HttpMessage object.
+ */
+PHP_METHOD(HttpRequest, getResponseMessage)
+{
+	zval *message;
+	getObject(http_request_object, obj);
+
+	NO_ARGS;
+
+	message = GET_PROP(obj, responseMessage);
+	Z_TYPE_P(return_value) = IS_OBJECT;
+	return_value->is_ref = 1;
+	return_value->value.obj = message->value.obj;
+	zval_add_ref(&return_value);
+}
+
 /* {{{ proto bool HttpRequest::send()
  *
  * Send the HTTP request.
@@ -1628,8 +1860,13 @@ PHP_METHOD(HttpRequest, getResponseInfo)
  * $r = new HttpRequest('http://example.com/feed.rss', HTTP_GET);
  * $r->setOptions(array('lastmodified' => filemtime('local.rss')));
  * $r->addQueryData(array('category' => 3));
- * if ($r->send() && $r->getResponseCode() == 200) {
- *     file_put_contents('local.rss', $r->getResponseBody());
+ * try {
+ *     $r->send();
+ *     if ($r->getResponseCode() == 200) {
+ *         file_put_contents('local.rss', $r->getResponseBody());
+ *    }
+ * } catch (HttpException $ex) {
+ *     echo $ex;
  * }
  * ?>
  * </pre>
@@ -1639,7 +1876,7 @@ PHP_METHOD(HttpRequest, getResponseInfo)
  * <?php
  * $r = new HttpRequest('http://example.com/form.php', HTTP_POST);
  * $r->setOptions(array('cookies' => array('lang' => 'de')));
- * $r->addPostData(array('user' => 'mike', 'pass' => 's3c|r3t'));
+ * $r->addpostFields(array('user' => 'mike', 'pass' => 's3c|r3t'));
  * $r->addPostFile('image', 'profile.jpg', 'image/jpeg');
  * if ($r->send()) {
  *     echo $r->getResponseBody();
@@ -1651,8 +1888,7 @@ PHP_METHOD(HttpRequest, send)
 {
 	STATUS status = FAILURE;
 	zval *meth, *URL, *qdata, *opts, *info, *resp;
-	char *response_data, *request_uri;
-	size_t response_len;
+	char *request_uri;
 	getObject(http_request_object, obj);
 
 	NO_ARGS;
@@ -1660,7 +1896,7 @@ PHP_METHOD(HttpRequest, send)
 	SET_EH_THROW_HTTP();
 
 	if ((!obj->ch) && (!(obj->ch = curl_easy_init()))) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initilaize cURL");
+		http_error(E_WARNING, HTTP_E_CURL, "Could not initilaize curl");
 		RETURN_FALSE;
 	}
 
@@ -1686,75 +1922,54 @@ PHP_METHOD(HttpRequest, send)
 	switch (Z_LVAL_P(meth))
 	{
 		case HTTP_GET:
-			status = http_get_ex(obj->ch, request_uri, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &response_data, &response_len);
+		case HTTP_HEAD:
+			status = http_request_ex(obj->ch, Z_LVAL_P(meth), request_uri, NULL, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
 		break;
 
-		case HTTP_HEAD:
-			status = http_head_ex(obj->ch, request_uri, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &response_data, &response_len);
+		case HTTP_PUT:
+		{
+			http_request_body body;
+			php_stream *stream;
+			php_stream_statbuf ssb;
+			zval *file = GET_PROP(obj, putFile);
+
+			if (	(stream = php_stream_open_wrapper(Z_STRVAL_P(file), , "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL)) && 
+					!php_stream_stat(stream, &ssb)) {
+				body.type = HTTP_REQUEST_BODY_UPLOADFILE;
+				body.data = stream;
+				body.size = ssb.sb.st_size;
+
+				status = http_put_ex(obj->ch, request_uri, &body, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
+				http_request_body_dtor(&body);
+			} else {
+				status = FAILURE;
+			}
+		}
 		break;
 
 		case HTTP_POST:
-			{
-				zval *post_files, *post_data;
-
-				post_files = GET_PROP(obj, postFiles);
-				post_data  = GET_PROP(obj, postData);
-
-				if (!zend_hash_num_elements(Z_ARRVAL_P(post_files))) {
-
-					/* urlencoded post */
-					status = http_post_array_ex(obj->ch, request_uri, Z_ARRVAL_P(post_data), Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &response_data, &response_len);
-
-				} else {
-
-					/*
-					 * multipart post
-					 */
-					char *key = NULL;
-					long idx;
-					zval **data;
-					struct curl_httppost *http_post_data[2] = {NULL, NULL};
-
-					/* normal data */
-					FOREACH_KEYVAL(post_data, key, idx, data) {
-						if (key) {
-							convert_to_string_ex(data);
-							curl_formadd(&http_post_data[0], &http_post_data[1],
-								CURLFORM_COPYNAME,			key,
-								CURLFORM_COPYCONTENTS,		Z_STRVAL_PP(data),
-								CURLFORM_CONTENTSLENGTH,	Z_STRLEN_PP(data),
-								CURLFORM_END
-							);
-
-							/* reset */
-							key = NULL;
-						}
-					}
-
-					/* file data */
-					FOREACH_VAL(post_files, data) {
-						zval **file, **type, **name;
-
-						if (	SUCCESS == zend_hash_find(Z_ARRVAL_PP(data), "name", sizeof("name"), (void **) &name) &&
-								SUCCESS == zend_hash_find(Z_ARRVAL_PP(data), "type", sizeof("type"), (void **) &type) &&
-								SUCCESS == zend_hash_find(Z_ARRVAL_PP(data), "file", sizeof("file"), (void **) &file)) {
-
-							curl_formadd(&http_post_data[0], &http_post_data[1],
-								CURLFORM_COPYNAME,		Z_STRVAL_PP(name),
-								CURLFORM_FILE,			Z_STRVAL_PP(file),
-								CURLFORM_CONTENTTYPE,	Z_STRVAL_PP(type),
-								CURLFORM_END
-							);
-						}
-					}
+		{
+			http_request_body body;
+			zval *fields = GET_PROP(obj, postFields), *files = GET_PROP(obj, postFiles);
 
-					status = http_post_curldata_ex(obj->ch, request_uri, http_post_data[0], Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &response_data, &response_len);
-					curl_formfree(http_post_data[0]);
-				}
+			if (SUCCESS == (status = http_request_body_fill(&body, Z_ARRVAL_P(fields), Z_ARRVAL_P(files)))) {
+				status = http_post_ex(obj->ch, request_uri, &body, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
+				http_request_body_dtor(&body);
 			}
+		}
 		break;
 
 		default:
+		{
+			http_request_body body;
+			zval *post = GET_PROP(obj, postData);
+			
+			body.type = HTTP_REQUEST_BODY_CSTRING;
+			body.data = Z_STRVAL_P(post);
+			body.size = Z_STRLEN_P(post);
+			
+			status = http_request_ex(obj->ch, Z_LVAL_P(meth), request_uri, &body, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
+		}
 		break;
 	}
 
@@ -1762,26 +1977,32 @@ PHP_METHOD(HttpRequest, send)
 
 	/* final data handling */
 	if (status == SUCCESS) {
-		char *body = NULL;
-		size_t body_len = 0;
-		zval *zheaders;
+		http_message *msg;
 
-		MAKE_STD_ZVAL(zheaders)
-		array_init(zheaders);
+		if (msg = http_message_parse(PHPSTR_VAL(&obj->response), PHPSTR_LEN(&obj->response))) {
+			zval *headers, *message;
+			char *body;
+			size_t body_len;
 
-		if (SUCCESS != http_split_response_ex(response_data, response_len, Z_ARRVAL_P(zheaders), &body, &body_len)) {
-			zval_dtor(zheaders);
-			efree(zheaders),
-			efree(response_data);
-			RETURN_FALSE;
-		}
+			UPD_PROP(obj, long, responseCode, msg->info.response.code);
 
-		add_assoc_zval(resp, "headers", zheaders);
-		add_assoc_stringl(resp, "body", body, body_len, 0);
+			MAKE_STD_ZVAL(headers)
+			array_init(headers);
 
-		efree(response_data);
+			zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+			phpstr_data(PHPSTR(msg), &body, &body_len);
 
-		RETURN_TRUE;
+			add_assoc_zval(resp, "headers", headers);
+			add_assoc_stringl(resp, "body", body, body_len, 0);
+
+			message = GET_PROP(obj, responseMessage);
+			zval_dtor(message);
+			Z_TYPE_P(message)  = IS_OBJECT;
+			message->value.obj = http_message_object_from_msg(msg);
+			SET_PROP(obj, responseMessage, message);
+		} else {
+			status = FAILURE;
+		}
 	}
 
 	SET_EH_NORMAL();
@@ -1801,4 +2022,3 @@ PHP_METHOD(HttpRequest, send)
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
  */
-