X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_methods.c;h=e06f34078521155fc777944afde0c4dfb135d176;hp=1c3b99c599528e2d7d10eb9add79a62680657c3a;hb=3739156e5901eb81df2bd844abf301e08cd52405;hpb=add8166df3235a7680703eddc36edee7dcc20b20

diff --git a/http_methods.c b/http_methods.c
index 1c3b99c..e06f340 100644
--- a/http_methods.c
+++ b/http_methods.c
@@ -21,9 +21,20 @@
 
 #include "php.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_std_defs.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"
+
+#include "php_http_message_object.h"
+#include "php_http_response_object.h"
+#include "php_http_request_object.h"
+#include "php_http_exception_object.h"
 
 #ifdef ZEND_ENGINE_2
 
@@ -42,13 +53,12 @@ PHP_METHOD(HttpResponse, __construct)
 	zend_bool do_cache = 0, do_gzip = 0;
 	getObject(http_response_object, obj);
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|bb", &do_cache, &do_gzip)) {
-		// throw exception
-		return;
+	SET_EH_THROW_HTTP();
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|bb", &do_cache, &do_gzip)) {
+		UPD_PROP(obj, long, cache, do_cache);
+		UPD_PROP(obj, long, gzip, do_gzip);
 	}
-
-	UPD_PROP(obj, long, cache, do_cache);
-	UPD_PROP(obj, long, gzip, do_gzip);
+	SET_EH_NORMAL();
 }
 /* }}} */
 
@@ -143,7 +153,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;
 	}
 
@@ -184,8 +194,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;
 	}
 
@@ -308,13 +317,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;
 }
@@ -353,7 +362,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;
 }
@@ -391,7 +400,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;
 }
@@ -438,6 +447,11 @@ PHP_METHOD(HttpResponse, send)
 	do_cache = GET_PROP(obj, cache);
 	do_gzip  = GET_PROP(obj, gzip);
 
+	/* gzip */
+	if (Z_LVAL_P(do_gzip)) {
+		php_start_ob_buffer_named("ob_gzhandler", 0, 1 TSRMLS_CC);
+	}
+
 	/* caching */
 	if (Z_LVAL_P(do_cache)) {
 		zval *cctrl, *etag, *lmod, *ccraw;
@@ -458,11 +472,6 @@ PHP_METHOD(HttpResponse, send)
 		}
 	}
 
-	/* gzip */
-	if (Z_LVAL_P(do_gzip)) {
-		/* ... */
-	}
-
 	/* content type */
 	{
 		zval *ctype = GET_PROP(obj, contentType);
@@ -512,6 +521,441 @@ PHP_METHOD(HttpResponse, send)
 /* }}} */
 /* }}} */
 
+/* {{{ HttpMessage */
+
+/* {{{ proto static HttpMessage HttpMessage::fromString(string raw_message)
+ *
+ * Create an HttpMessage object from a string.
+ */
+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();
+	}
+
+	if (!(msg = http_message_parse(string, length))) {
+		RETURN_NULL();
+	}
+
+	Z_TYPE_P(return_value) = IS_OBJECT;
+	return_value->value.obj = http_message_object_from_msg(msg);
+}
+/* }}} */
+
+/* {{{ proto void HttpMessage::__construct([string message])
+ *
+ * Instantiate a new HttpMessage object.
+ */
+PHP_METHOD(HttpMessage, __construct)
+{
+	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, "|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();
+}
+/* }}} */
+
+/* {{{ proto string HttpMessage::getBody()
+ *
+ * Get the body of the parsed Message.
+ */
+PHP_METHOD(HttpMessage, getBody)
+{
+	zval *body;
+	getObject(http_message_object, obj);
+
+	NO_ARGS;
+
+	RETURN_PHPSTR(&obj->message->body, PHPSTR_FREE_NOT, 1);
+}
+/* }}} */
+
+/* {{{ proto array HttpMessage::getHeaders()
+ *
+ * Get Message Headers.
+ */
+PHP_METHOD(HttpMessage, getHeaders)
+{
+	zval headers;
+	getObject(http_message_object, obj);
+
+	NO_ARGS;
+
+	Z_ARRVAL(headers) = &obj->message->hdrs;
+	array_init(return_value);
+	array_copy(&headers, return_value);
+}
+/* }}} */
+
+/* {{{ proto void HttpMessage::setHeaders(array headers)
+ *
+ * Sets new headers.
+ */
+PHP_METHOD(HttpMessage, setHeaders)
+{
+	zval *new_headers, old_headers;
+	getObject(http_message_object, obj);
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &new_headers)) {
+		return;
+	}
+
+	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);
+	}
+}
+/* }}} */
+
+/* {{{ proto long HttpMessage::getType()
+ *
+ * Get Message Type. (HTTP_MSG_NONE|HTTP_MSG_REQUEST|HTTP_MSG_RESPONSE)
+ */
+PHP_METHOD(HttpMessage, getType)
+{
+	getObject(http_message_object, obj);
+
+	NO_ARGS;
+
+	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);
+}
+/* }}} */
+
+/* {{{ proto long HttpMessage::getResponseCode()
+ *
+ * Get the Response Code of the Message.
+ */
+PHP_METHOD(HttpMessage, getResponseCode)
+{
+	getObject(http_message_object, obj);
+
+	NO_ARGS;
+
+	if (!HTTP_MSG_TYPE(RESPONSE, obj->message)) {
+		http_error(E_NOTICE, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_RESPONSE");
+		RETURN_NULL();
+	}
+
+	RETURN_LONG(obj->message->info.response.code);
+}
+/* }}} */
+
+/* {{{ 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)
+{
+	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();
+	}
+
+	RETURN_STRING(obj->message->info.request.method, 1);
+}
+/* }}} */
+
+/* {{{ 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.
+ */
+PHP_METHOD(HttpMessage, getRequestUri)
+{
+	zval *uri;
+	getObject(http_message_object, obj);
+
+	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();
+	}
+
+	RETURN_STRING(obj->message->info.request.URI, 1);
+}
+/* }}} */
+
+/* {{{ 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)
+{
+	char ver[4] = {0};
+	float version;
+	getObject(http_message_object, obj);
+
+	NO_ARGS;
+
+	switch (obj->message->type)
+	{
+		case HTTP_MSG_RESPONSE:
+			version = obj->message->info.response.http_version;
+		break;
+
+		case HTTP_MSG_REQUEST:
+			version = obj->message->info.request.http_version;
+		break;
+
+		case HTTP_MSG_NONE:
+		default:
+			RETURN_NULL();
+	}
+	sprintf(ver, "%1.1f", version);
+	RETURN_STRINGL(ver, 3, 1);
+}
+/* }}} */
+
+/* {{{ 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.
+ */
+PHP_METHOD(HttpMessage, toString)
+{
+	char *string;
+	size_t length;
+	zend_bool include_parent = 1;
+	getObject(http_message_object, obj);
+
+	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);
+}
+/* }}} */
+
+/* }}} */
+
 #ifdef HTTP_HAVE_CURL
 /* {{{ HttpRequest */
 
@@ -527,22 +971,22 @@ PHP_METHOD(HttpRequest, __construct)
 	long meth = -1;
 	getObject(http_request_object, obj);
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sl", &URL, &URL_len, &meth)) {
-		return;
-	}
-
-	INIT_PARR(obj, options);
-	INIT_PARR(obj, responseInfo);
-	INIT_PARR(obj, responseData);
-	INIT_PARR(obj, postData);
-	INIT_PARR(obj, postFiles);
+	SET_EH_THROW_HTTP();
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sl", &URL, &URL_len, &meth)) {
+		INIT_PARR(obj, options);
+		INIT_PARR(obj, responseInfo);
+		INIT_PARR(obj, responseData);
+		INIT_PARR(obj, postData);
+		INIT_PARR(obj, postFiles);
 
-	if (URL) {
-		UPD_PROP(obj, string, url, URL);
-	}
-	if (meth > -1) {
-		UPD_PROP(obj, long, method, meth);
+		if (URL) {
+			UPD_PROP(obj, string, url, URL);
+		}
+		if (meth > -1) {
+			UPD_PROP(obj, long, method, meth);
+		}
 	}
+	SET_EH_NORMAL();
 }
 /* }}} */
 
@@ -915,9 +1359,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;
 	}
 
@@ -1128,7 +1570,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 {
@@ -1346,19 +1788,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), "Status", sizeof("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));
 }
 /* }}} */
 
@@ -1384,7 +1820,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 {
@@ -1394,6 +1830,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.
@@ -1404,8 +1858,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>
@@ -1427,14 +1886,15 @@ 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;
 
+	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;
 	}
 
@@ -1460,11 +1920,11 @@ 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);
+			status = http_get_ex(obj->ch, request_uri, 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);
+			status = http_head_ex(obj->ch, request_uri, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
 		break;
 
 		case HTTP_POST:
@@ -1477,7 +1937,7 @@ PHP_METHOD(HttpRequest, send)
 				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);
+					status = http_post_array_ex(obj->ch, request_uri, Z_ARRVAL_P(post_data), Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
 
 				} else {
 
@@ -1522,7 +1982,7 @@ PHP_METHOD(HttpRequest, send)
 						}
 					}
 
-					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);
+					status = http_post_curldata_ex(obj->ch, request_uri, http_post_data[0], Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
 					curl_formfree(http_post_data[0]);
 				}
 			}
@@ -1535,31 +1995,37 @@ PHP_METHOD(HttpRequest, send)
 	efree(request_uri);
 
 	/* final data handling */
-	if (status != SUCCESS) {
-		RETURN_FALSE;
-	} else {
-		char *body = NULL;
-		size_t body_len = 0;
-		zval *zheaders;
+	if (status == SUCCESS) {
+		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();
+	RETURN_SUCCESS(status);
 }
 /* }}} */
 /* }}} */