X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_object.c;h=8ff7b25ed21fcb98874fa877f5f23d3572e80fd6;hp=cbb8b2be93b0810b521c174a54b9c597021b8898;hb=7b88d9022c90eb12e5fe195af8644935141c9d68;hpb=2334ad58dd0d288f1ef49ab3d449376763df4fba

diff --git a/http_request_object.c b/http_request_object.c
index cbb8b2b..8ff7b25 100644
--- a/http_request_object.c
+++ b/http_request_object.c
@@ -1,57 +1,46 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
-
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-#include "php.h"
+
+#define HTTP_WANT_CURL
+#include "php_http.h"
 
 #if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
 
-#include "php_http_std_defs.h"
-#include "php_http_request_object.h"
-#include "php_http_request_api.h"
-#include "php_http_request_pool_api.h"
-#include "php_http.h"
+#include "zend_interfaces.h"
+
 #include "php_http_api.h"
-#include "php_http_url_api.h"
+#include "php_http_exception_object.h"
 #include "php_http_message_api.h"
 #include "php_http_message_object.h"
-#include "php_http_exception_object.h"
-
-#include "missing.h"
-
-#ifdef PHP_WIN32
-#	include <winsock2.h>
-#endif
-#include <curl/curl.h>
-
-ZEND_EXTERN_MODULE_GLOBALS(http);
+#include "php_http_request_api.h"
+#include "php_http_request_object.h"
+#include "php_http_request_pool_api.h"
+#include "php_http_url_api.h"
 
 #define HTTP_BEGIN_ARGS(method, ret_ref, req_args) 	HTTP_BEGIN_ARGS_EX(HttpRequest, method, ret_ref, req_args)
 #define HTTP_EMPTY_ARGS(method, ret_ref)			HTTP_EMPTY_ARGS_EX(HttpRequest, method, ret_ref)
 #define HTTP_REQUEST_ME(method, visibility)			PHP_ME(HttpRequest, method, HTTP_ARGS(HttpRequest, method), visibility)
 #define HTTP_REQUEST_ALIAS(method, func)			HTTP_STATIC_ME_ALIAS(method, func, HTTP_ARGS(HttpRequest, method))
 
-HTTP_EMPTY_ARGS(__destruct, 0);
 HTTP_BEGIN_ARGS(__construct, 0, 0)
 	HTTP_ARG_VAL(url, 0)
 	HTTP_ARG_VAL(method, 0)
+	HTTP_ARG_VAL(options, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getOptions, 0);
@@ -155,11 +144,13 @@ HTTP_BEGIN_ARGS(getResponseInfo, 0, 0)
 	HTTP_ARG_VAL(name, 0)
 HTTP_END_ARGS;
 
-HTTP_EMPTY_ARGS(getResponseMessage, 1);
-HTTP_EMPTY_ARGS(getRequestMessage, 1);
-HTTP_EMPTY_ARGS(getHistory, 1);
+HTTP_EMPTY_ARGS(getResponseMessage, 0);
+HTTP_EMPTY_ARGS(getRawResponseMessage, 0);
+HTTP_EMPTY_ARGS(getRequestMessage, 0);
+HTTP_EMPTY_ARGS(getRawRequestMessage, 0);
+HTTP_EMPTY_ARGS(getHistory, 0);
 HTTP_EMPTY_ARGS(clearHistory, 0);
-HTTP_EMPTY_ARGS(send, 1);
+HTTP_EMPTY_ARGS(send, 0);
 
 HTTP_BEGIN_ARGS(get, 0, 1)
 	HTTP_ARG_VAL(url, 0)
@@ -223,7 +214,6 @@ static inline void _http_request_object_declare_default_properties(TSRMLS_D);
 zend_class_entry *http_request_object_ce;
 zend_function_entry http_request_object_fe[] = {
 	HTTP_REQUEST_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-	HTTP_REQUEST_ME(__destruct, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR)
 
 	HTTP_REQUEST_ME(setOptions, ZEND_ACC_PUBLIC)
 	HTTP_REQUEST_ME(getOptions, ZEND_ACC_PUBLIC)
@@ -275,7 +265,9 @@ zend_function_entry http_request_object_fe[] = {
 	HTTP_REQUEST_ME(getResponseBody, ZEND_ACC_PUBLIC)
 	HTTP_REQUEST_ME(getResponseInfo, ZEND_ACC_PUBLIC)
 	HTTP_REQUEST_ME(getResponseMessage, ZEND_ACC_PUBLIC)
+	HTTP_REQUEST_ME(getRawResponseMessage, ZEND_ACC_PUBLIC)
 	HTTP_REQUEST_ME(getRequestMessage, ZEND_ACC_PUBLIC)
+	HTTP_REQUEST_ME(getRawRequestMessage, ZEND_ACC_PUBLIC)
 	HTTP_REQUEST_ME(getHistory, ZEND_ACC_PUBLIC)
 	HTTP_REQUEST_ME(clearHistory, ZEND_ACC_PUBLIC)
 
@@ -295,23 +287,31 @@ zend_function_entry http_request_object_fe[] = {
 };
 static zend_object_handlers http_request_object_handlers;
 
-void _http_request_object_init(INIT_FUNC_ARGS)
+PHP_MINIT_FUNCTION(http_request_object)
 {
 	HTTP_REGISTER_CLASS_EX(HttpRequest, http_request_object, NULL, 0);
+	http_request_object_handlers.clone_obj = _http_request_object_clone_obj;
+	return SUCCESS;
 }
 
 zend_object_value _http_request_object_new(zend_class_entry *ce TSRMLS_DC)
+{
+	return http_request_object_new_ex(ce, curl_easy_init(), NULL);
+}
+
+zend_object_value _http_request_object_new_ex(zend_class_entry *ce, CURL *ch, http_request_object **ptr TSRMLS_DC)
 {
 	zend_object_value ov;
 	http_request_object *o;
 
 	o = ecalloc(1, sizeof(http_request_object));
 	o->zo.ce = ce;
-	o->ch = curl_easy_init();
-
+	o->request = http_request_init_ex(NULL, ch, 0, NULL);
 	phpstr_init(&o->history);
-	phpstr_init(&o->request);
-	phpstr_init_ex(&o->response, HTTP_CURLBUF_SIZE, 0);
+	
+	if (ptr) {
+		*ptr = o;
+	}
 
 	ALLOC_HASHTABLE(OBJ_PROP(o));
 	zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
@@ -323,27 +323,43 @@ zend_object_value _http_request_object_new(zend_class_entry *ce TSRMLS_DC)
 	return ov;
 }
 
+zend_object_value _http_request_object_clone_obj(zval *this_ptr TSRMLS_DC)
+{
+	zend_object *old_zo;
+	zend_object_value new_ov;
+	http_request_object *new_obj;
+	getObject(http_request_object, old_obj);
+	
+	old_zo = zend_objects_get_address(this_ptr TSRMLS_CC);
+	new_ov = http_request_object_new_ex(old_zo->ce, curl_easy_duphandle(old_obj->request->ch), &new_obj);
+	
+	zend_objects_clone_members(&new_obj->zo, new_ov, old_zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC);
+	phpstr_append(&new_obj->history, old_obj->history.data, old_obj->history.used);
+	phpstr_append(&new_obj->request->conv.request, old_obj->request->conv.request.data, old_obj->request->conv.request.used);
+	phpstr_append(&new_obj->request->conv.response, old_obj->request->conv.response.data, old_obj->request->conv.response.used);
+	
+	return new_ov;
+}
+
 static inline void _http_request_object_declare_default_properties(TSRMLS_D)
 {
 	zend_class_entry *ce = http_request_object_ce;
 
-	DCL_PROP_N(PROTECTED, options);
-	DCL_PROP_N(PROTECTED, responseInfo);
-	DCL_PROP_N(PROTECTED, responseData);
-	DCL_PROP_N(PROTECTED, responseCode);
-	DCL_PROP_N(PROTECTED, responseMessage);
-	DCL_PROP_N(PROTECTED, postFields);
-	DCL_PROP_N(PROTECTED, postFiles);
-
-	DCL_PROP(PROTECTED, long, method, HTTP_GET);
-
-	DCL_PROP(PROTECTED, string, url, "");
-	DCL_PROP(PROTECTED, string, contentType, "");
-	DCL_PROP(PROTECTED, string, rawPostData, "");
-	DCL_PROP(PROTECTED, string, queryData, "");
-	DCL_PROP(PROTECTED, string, putFile, "");
-
-	DCL_PROP(PUBLIC, bool, recordHistory, 1);
+	DCL_PROP_N(PRIVATE, options);
+	DCL_PROP_N(PRIVATE, postFields);
+	DCL_PROP_N(PRIVATE, postFiles);
+	DCL_PROP_N(PRIVATE, responseInfo);
+	DCL_PROP_N(PRIVATE, responseData);
+	DCL_PROP_N(PRIVATE, responseMessage);
+	DCL_PROP(PRIVATE, long, responseCode, 0);
+	DCL_PROP(PRIVATE, long, method, HTTP_GET);
+	DCL_PROP(PRIVATE, string, url, "");
+	DCL_PROP(PRIVATE, string, contentType, "");
+	DCL_PROP(PRIVATE, string, rawPostData, "");
+	DCL_PROP(PRIVATE, string, queryData, "");
+	DCL_PROP(PRIVATE, string, putFile, "");
+
+	DCL_PROP(PUBLIC, bool, recordHistory, 0);
 
 #ifndef WONKY
 	/*
@@ -384,12 +400,10 @@ static inline void _http_request_object_declare_default_properties(TSRMLS_D)
 	/*
 	 * Auth Constants
 	 */
-#	if LIBCURL_VERSION_NUM >= 0x070a05
 	DCL_CONST(long, "AUTH_BASIC", CURLAUTH_BASIC);
 	DCL_CONST(long, "AUTH_DIGEST", CURLAUTH_DIGEST);
 	DCL_CONST(long, "AUTH_NTLM", CURLAUTH_NTLM);
 	DCL_CONST(long, "AUTH_ANY", CURLAUTH_ANY);
-#	endif /* LIBCURL_VERSION_NUM */
 #endif /* WONKY */
 }
 
@@ -401,47 +415,24 @@ void _http_request_object_free(zend_object *object TSRMLS_DC)
 		zend_hash_destroy(OBJ_PROP(o));
 		FREE_HASHTABLE(OBJ_PROP(o));
 	}
-	if (o->ch) {
-		/* avoid nasty segfaults with already cleaned up callbacks */
-		curl_easy_setopt(o->ch, CURLOPT_NOPROGRESS, 1);
-		curl_easy_setopt(o->ch, CURLOPT_PROGRESSFUNCTION, NULL);
-		curl_easy_setopt(o->ch, CURLOPT_VERBOSE, 0);
-		curl_easy_setopt(o->ch, CURLOPT_DEBUGFUNCTION, NULL);
-		curl_easy_cleanup(o->ch);
-	}
-	phpstr_dtor(&o->response);
-	phpstr_dtor(&o->request);
+	http_request_free(&o->request);
 	phpstr_dtor(&o->history);
 	efree(o);
 }
 
-STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ptr, http_request_body *body TSRMLS_DC)
+STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ptr TSRMLS_DC)
 {
-	zval *meth, *URL;
-	char *request_uri;
 	STATUS status = SUCCESS;
 
-	if (!body) {
-		return FAILURE;
-	}
-	if ((!obj->ch) && (!(obj->ch = curl_easy_init()))) {
-		http_error(HE_WARNING, HTTP_E_REQUEST, "Could not initilaize curl");
-		return FAILURE;
-	}
-
-	URL = convert_to_type_ex(IS_STRING, GET_PROP(obj, url));
-	// HTTP_URI_MAXLEN+1 long char *
-	if (!(request_uri = http_absolute_uri_ex(Z_STRVAL_P(URL), Z_STRLEN_P(URL), NULL, 0, NULL, 0, 0))) {
-		return FAILURE;
-	}
+	http_request_reset(obj->request);
+	HTTP_CHECK_CURL_INIT(obj->request->ch, curl_easy_init(), return FAILURE);
 	
-	meth = convert_to_type_ex(IS_LONG, GET_PROP(obj, method));
-	switch (Z_LVAL_P(meth))
+	obj->request->url = http_absolute_url(Z_STRVAL_P(GET_PROP(obj, url)));
+	
+	switch (obj->request->meth = Z_LVAL_P(GET_PROP(obj, method)))
 	{
 		case HTTP_GET:
 		case HTTP_HEAD:
-			body->type = -1;
-			body = NULL;
 		break;
 
 		case HTTP_PUT:
@@ -450,9 +441,7 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
 			php_stream *stream = php_stream_open_wrapper(Z_STRVAL_P(GET_PROP(obj, putFile)), "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL);
 			
 			if (stream && !php_stream_stat(stream, &ssb)) {
-				body->type = HTTP_REQUEST_BODY_UPLOADFILE;
-				body->data = stream;
-				body->size = ssb.sb.st_size;
+				http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_UPLOADFILE, stream, ssb.sb.st_size, 1);
 			} else {
 				status = FAILURE;
 			}
@@ -463,22 +452,19 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
 		default:
 		{
 			/* check for raw post data */
-			zval *raw_data = convert_to_type_ex(IS_STRING, GET_PROP(obj, rawPostData));
+			zval *raw_data = GET_PROP(obj, rawPostData);
 			
 			if (Z_STRLEN_P(raw_data)) {
-				zval *ctype = convert_to_type_ex(IS_STRING, GET_PROP(obj, contentType));
+				zval *ctype = GET_PROP(obj, contentType);
 				
 				if (Z_STRLEN_P(ctype)) {
 					zval **headers, *opts = GET_PROP(obj, options);
 					
-					convert_to_array(opts);
-					
-					if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void **) &headers)) {
+					if ((SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void **) &headers)) && (Z_TYPE_PP(headers) == IS_ARRAY)) {
 						zval **ct_header;
 						
-						convert_to_array(*headers);
 						/* only override if not already set */
-						if (SUCCESS != zend_hash_find(Z_ARRVAL_PP(headers), "Content-Type", sizeof("Content-Type"), (void **) &ct_header)) {
+						if ((SUCCESS != zend_hash_find(Z_ARRVAL_PP(headers), "Content-Type", sizeof("Content-Type"), (void **) &ct_header)) && (Z_TYPE_PP(ct_header) == IS_STRING)) {
 							add_assoc_stringl(*headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1);
 						}
 					} else {
@@ -490,37 +476,41 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
 						add_assoc_zval(opts, "headers", headers);
 					}
 				}
+
+				obj->request->body = http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_CSTRING,
+					estrndup(Z_STRVAL_P(raw_data), Z_STRLEN_P(raw_data)), Z_STRLEN_P(raw_data), 1);
 				
-				body->type = HTTP_REQUEST_BODY_CSTRING;
-				body->data = estrndup(Z_STRVAL_P(raw_data), Z_STRLEN_P(raw_data));
-				body->size = Z_STRLEN_P(raw_data);
 			} else {
-				status = http_request_body_fill(body, Z_ARRVAL_P(GET_PROP(obj, postFields)), Z_ARRVAL_P(GET_PROP(obj, postFiles)));
+				zval *zfields = GET_PROP(obj, postFields), *zfiles = GET_PROP(obj, postFiles);
+				HashTable *fields;
+				HashTable *files;
+				
+				fields = (Z_TYPE_P(zfields) == IS_ARRAY) ? Z_ARRVAL_P(zfields) : NULL;
+				files = (Z_TYPE_P(zfiles) == IS_ARRAY) ? Z_ARRVAL_P(zfiles) : NULL;
+				
+				if (!(obj->request->body = http_request_body_fill(obj->request->body, fields, files))) {
+					status = FAILURE;
+				}
 			}
 		}
 		break;
 	}
-	
+
 	if (status == SUCCESS) {
-		zval *qdata = convert_to_type_ex(IS_STRING, GET_PROP(obj, queryData));
+		zval *qdata = GET_PROP(obj, queryData);
+		zval *options = GET_PROP(obj, options);
 		
-		if (Z_STRLEN_P(qdata) && (strlen(request_uri) < HTTP_URI_MAXLEN)) {
-			if (!strchr(request_uri, '?')) {
-				strcat(request_uri, "?");
+		if (Z_STRLEN_P(qdata)) {
+			if (!strchr(obj->request->url, '?')) {
+				strlcat(obj->request->url, "?", HTTP_URL_MAXLEN);
 			} else {
-				strcat(request_uri, "&");
+				strlcat(obj->request->url, "&", HTTP_URL_MAXLEN);
 			}
-			strncat(request_uri, Z_STRVAL_P(qdata), HTTP_URI_MAXLEN - strlen(request_uri));
+			strlcat(obj->request->url, Z_STRVAL_P(qdata), HTTP_URL_MAXLEN);
 		}
 		
-		status = http_request_init(obj->ch, Z_LVAL_P(meth), request_uri, body, Z_ARRVAL_P(GET_PROP(obj, options)));
+		http_request_prepare(obj->request, Z_ARRVAL_P(options));
 	}
-	efree(request_uri);
-
-	/* clean previous response */
-	phpstr_dtor(&obj->response);
-	/* clean previous request */
-	phpstr_dtor(&obj->request);
 
 	return status;
 }
@@ -528,27 +518,25 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
 STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this_ptr TSRMLS_DC)
 {
 	http_message *msg;
-
-	phpstr_fix(&obj->request);
-	phpstr_fix(&obj->response);
 	
-	msg = http_message_parse(PHPSTR_VAL(&obj->response), PHPSTR_LEN(&obj->response));
+	phpstr_fix(&obj->request->conv.request);
+	phpstr_fix(&obj->request->conv.response);
+	
+	msg = http_message_parse(PHPSTR_VAL(&obj->request->conv.response), PHPSTR_LEN(&obj->request->conv.response));
 	
 	if (!msg) {
 		return FAILURE;
 	} else {
 		char *body;
 		size_t body_len;
-		zval *headers, *message,
-			*resp = convert_to_type(IS_ARRAY, GET_PROP(obj, responseData)),
-			*info = convert_to_type(IS_ARRAY, GET_PROP(obj, responseInfo));
+		zval *headers, *message, *resp, *info;
 
 		if (zval_is_true(GET_PROP(obj, recordHistory))) {
 			/* we need to act like a zipper, as we'll receive
 			 * the requests and the responses in separate chains
 			 * for redirects
 			 */
-			http_message *response = msg, *request = http_message_parse(PHPSTR_VAL(&obj->request), PHPSTR_LEN(&obj->request));
+			http_message *response = msg, *request = http_message_parse(PHPSTR_VAL(&obj->request->conv.request), PHPSTR_LEN(&obj->request->conv.request));
 			http_message *free_msg = request;
 
 			do {
@@ -571,22 +559,27 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this
 
 		UPD_PROP(obj, long, responseCode, msg->http.info.response.code);
 
-		MAKE_STD_ZVAL(headers)
+		MAKE_STD_ZVAL(resp);
+		array_init(resp);
+		MAKE_STD_ZVAL(headers);
 		array_init(headers);
-
 		zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
-		phpstr_data(PHPSTR(msg), &body, &body_len);
-
 		add_assoc_zval(resp, "headers", headers);
+		phpstr_data(PHPSTR(msg), &body, &body_len);
 		add_assoc_stringl(resp, "body", body, body_len, 0);
+		SET_PROP(obj, responseData, resp);
+		zval_ptr_dtor(&resp);
 
 		MAKE_STD_ZVAL(message);
-		ZVAL_OBJVAL(message, http_message_object_from_msg(msg));
+		ZVAL_OBJVAL(message, http_message_object_new_ex(http_message_object_ce, msg, NULL));
 		SET_PROP(obj, responseMessage, message);
 		zval_ptr_dtor(&message);
 
-		http_request_info(obj->ch, Z_ARRVAL_P(info));
+		MAKE_STD_ZVAL(info);
+		array_init(info);
+		http_request_info(obj->request, Z_ARRVAL_P(info));
 		SET_PROP(obj, responseInfo, info);
+		zval_ptr_dtor(&info);
 
 		return SUCCESS;
 	}
@@ -596,31 +589,37 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this
 	_http_request_object_set_options_subr(INTERNAL_FUNCTION_PARAM_PASSTHRU, (key), sizeof(key), (ow))
 static inline void _http_request_object_set_options_subr(INTERNAL_FUNCTION_PARAMETERS, char *key, size_t len, int overwrite)
 {
-	zval *opts, **options, *new_options = NULL;
+	zval *old_opts, *new_opts, *opts, **entry;
 	getObject(http_request_object, obj);
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a/!", &new_options)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a/!", &opts)) {
 		RETURN_FALSE;
 	}
 
-	opts = convert_to_type(IS_ARRAY, GET_PROP(obj, options));
+	MAKE_STD_ZVAL(new_opts);
+	array_init(new_opts);
+	old_opts = GET_PROP(obj, options);
+	if (Z_TYPE_P(old_opts) == IS_ARRAY) {
+		array_copy(old_opts, new_opts);
+	}
 
-	if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), key, len, (void **) &options)) {
-		convert_to_array(*options);
+	if (SUCCESS == zend_hash_find(Z_ARRVAL_P(new_opts), key, len, (void **) &entry)) {
 		if (overwrite) {
-			zend_hash_clean(Z_ARRVAL_PP(options));
+			zend_hash_clean(Z_ARRVAL_PP(entry));
 		}
-		if (new_options && zend_hash_num_elements(Z_ARRVAL_P(new_options))) {
+		if (opts && zend_hash_num_elements(Z_ARRVAL_P(opts))) {
 			if (overwrite) {
-				array_copy(new_options, *options);
+				array_copy(opts, *entry);
 			} else {
-				array_merge(new_options, *options);
+				array_merge(opts, *entry);
 			}
 		}
-	} else if (new_options && zend_hash_num_elements(Z_ARRVAL_P(new_options))) {
-		zval_add_ref(&new_options);
-		add_assoc_zval(opts, key, new_options);
+	} else if (opts) {
+		ZVAL_ADDREF(opts);
+		add_assoc_zval(new_opts, key, opts);
 	}
+	SET_PROP(obj, options, new_opts);
+	zval_ptr_dtor(&new_opts);
 
 	RETURN_TRUE;
 }
@@ -635,7 +634,7 @@ static inline void _http_request_get_options_subr(INTERNAL_FUNCTION_PARAMETERS,
 		zval *opts, **options;
 		getObject(http_request_object, obj);
 
-		opts = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, options));
+		opts = GET_PROP(obj, options);
 
 		array_init(return_value);
 
@@ -649,13 +648,14 @@ static inline void _http_request_get_options_subr(INTERNAL_FUNCTION_PARAMETERS,
 
 /* ### USERLAND ### */
 
-/* {{{ proto void HttpRequest::__construct([string url[, int request_method = HTTP_METH_GET]])
+/* {{{ proto void HttpRequest::__construct([string url[, int request_method = HTTP_METH_GET[, array options]]])
  *
  * Instantiate a new HttpRequest object.
  * 
  * Accepts a string as optional parameter containing the target request url.
  * Additianally accepts an optional int parameter specifying the request method
- * to use.
+ * to use and an associative array as optional third parameter which will be
+ * passed to HttpRequest::setOptions(). 
  * 
  * Throws HttpException.
  */
@@ -664,45 +664,25 @@ PHP_METHOD(HttpRequest, __construct)
 	char *URL = NULL;
 	int URL_len;
 	long meth = -1;
+	zval *options = NULL;
 	getObject(http_request_object, obj);
 
 	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, postFields);
-		INIT_PARR(obj, postFiles);
-
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sla", &URL, &URL_len, &meth, &options)) {
 		if (URL) {
 			UPD_STRL(obj, url, URL, URL_len);
 		}
 		if (meth > -1) {
 			UPD_PROP(obj, long, method, meth);
 		}
+		if (options) {
+			zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "setoptions", NULL, options);
+		}
 	}
 	SET_EH_NORMAL();
 }
 /* }}} */
 
-/* {{{ proto void HttpRequest::__destruct()
- *
- * Destroys the HttpRequest object.
- */
-PHP_METHOD(HttpRequest, __destruct)
-{
-	getObject(http_request_object, obj);
-
-	NO_ARGS;
-
-	FREE_PARR(obj, options);
-	FREE_PARR(obj, responseInfo);
-	FREE_PARR(obj, responseData);
-	FREE_PARR(obj, postFields);
-	FREE_PARR(obj, postFiles);
-}
-/* }}} */
-
 /* {{{ proto bool HttpRequest::setOptions([array options])
  *
  * Set the request options to use.  See http_get() for a full list of available options.
@@ -717,51 +697,55 @@ PHP_METHOD(HttpRequest, setOptions)
 {
 	char *key = NULL;
 	ulong idx = 0;
-	zval *opts = NULL, *old_opts, **opt;
+	HashPosition pos;
+	zval *opts = NULL, *old_opts, *new_opts, **opt;
 	getObject(http_request_object, obj);
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a/!", &opts)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts)) {
 		RETURN_FALSE;
 	}
 	
-	old_opts = convert_to_type(IS_ARRAY, GET_PROP(obj, options));
-
+	MAKE_STD_ZVAL(new_opts);
+	array_init(new_opts);
+		
 	if (!opts || !zend_hash_num_elements(Z_ARRVAL_P(opts))) {
-		zend_hash_clean(Z_ARRVAL_P(old_opts));
+		SET_PROP(obj, options, new_opts);
 		RETURN_TRUE;
 	}
 
+	old_opts = GET_PROP(obj, options);
+	if (Z_TYPE_P(old_opts) == IS_ARRAY) {
+		array_copy(old_opts, new_opts);
+	}
+	
 	/* some options need extra attention -- thus cannot use array_merge() directly */
-	FOREACH_KEYVAL(opts, key, idx, opt) {
+	FOREACH_KEYVAL(pos, opts, key, idx, opt) {
 		if (key) {
 			if (!strcmp(key, "headers")) {
 				zval **headers;
-				if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "headers", sizeof("headers"), (void **) &headers)) {
-					convert_to_array(*opt);
+				if (SUCCESS == zend_hash_find(Z_ARRVAL_P(new_opts), "headers", sizeof("headers"), (void **) &headers)) {
+					convert_to_array_ex(opt);
 					convert_to_array(*headers);
 					array_merge(*opt, *headers);
 					continue;
 				}
 			} else if (!strcmp(key, "cookies")) {
 				zval **cookies;
-				if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "cookies", sizeof("cookies"), (void **) &cookies)) {
-					convert_to_array(*opt);
+				if (SUCCESS == zend_hash_find(Z_ARRVAL_P(new_opts), "cookies", sizeof("cookies"), (void **) &cookies)) {
+					convert_to_array_ex(opt);
 					convert_to_array(*cookies);
 					array_merge(*opt, *cookies);
 					continue;
 				}
 			} else if (!strcmp(key, "ssl")) {
 				zval **ssl;
-				if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "ssl", sizeof("ssl"), (void **) &ssl)) {
-					convert_to_array(*opt);
+				if (SUCCESS == zend_hash_find(Z_ARRVAL_P(new_opts), "ssl", sizeof("ssl"), (void **) &ssl)) {
+					convert_to_array_ex(opt);
 					convert_to_array(*ssl);
 					array_merge(*opt, *ssl);
 					continue;
 				}
-			} else if ((!strcasecmp(key, "url")) || (!strcasecmp(key, "uri"))) {
-				if (Z_TYPE_PP(opt) != IS_STRING) {
-					convert_to_string_ex(opt);
-				}
+			} else if ((Z_TYPE_PP(opt) == IS_STRING) && ((!strcasecmp(key, "url")) || (!strcasecmp(key, "uri")))) {
 				UPD_STRL(obj, url, Z_STRVAL_PP(opt), Z_STRLEN_PP(opt));
 				continue;
 			} else if (!strcmp(key, "method")) {
@@ -771,15 +755,17 @@ PHP_METHOD(HttpRequest, setOptions)
 				UPD_PROP(obj, long, method, Z_LVAL_PP(opt));
 				continue;
 			}
-
-			zval_add_ref(opt);
-			add_assoc_zval(old_opts, key, *opt);
+			
+			ZVAL_ADDREF(*opt);
+			add_assoc_zval(new_opts, key, *opt);
 
 			/* reset */
 			key = NULL;
 		}
 	}
-
+	SET_PROP(obj, options, new_opts);
+	zval_ptr_dtor(&new_opts);
+	
 	RETURN_TRUE;
 }
 /* }}} */
@@ -795,12 +781,10 @@ PHP_METHOD(HttpRequest, getOptions)
 	NO_ARGS;
 
 	IF_RETVAL_USED {
-		zval *opts;
 		getObject(http_request_object, obj);
-
-		opts = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, options));
-		array_init(return_value);
-		array_copy(opts, return_value);
+		zval *options = GET_PROP(obj, options);
+		
+		RETURN_ZVAL(options, 1, 0);
 	}
 }
 /* }}} */
@@ -964,9 +948,9 @@ PHP_METHOD(HttpRequest, getUrl)
 
 	IF_RETVAL_USED {
 		getObject(http_request_object, obj);
-		zval *URL = GET_PROP(obj, url);
-
-		RETURN_ZVAL(URL, 1, 0);
+		zval *url = GET_PROP(obj, url);
+		
+		RETURN_ZVAL(url, 1, 0);
 	}
 }
 /* }}} */
@@ -976,7 +960,7 @@ PHP_METHOD(HttpRequest, getUrl)
  * Set the request method.
  * 
  * Expects an int as parameter specifying the request method to use.
- * In PHP 5.1+ HttpRequest::METH, otherwise the HTTP_METH constants can be used.
+ * In PHP 5.1+ HttpRequest::METH_*, otherwise the HTTP_METH_* constants can be used.
  * 
  * Returns TRUE on success, or FALSE on failure.
  */
@@ -1006,9 +990,9 @@ PHP_METHOD(HttpRequest, getMethod)
 
 	IF_RETVAL_USED {
 		getObject(http_request_object, obj);
-		zval *meth = GET_PROP(obj, method);
+		zval *method = GET_PROP(obj, method);
 		
-		RETURN_ZVAL(meth, 1, 0);
+		RETURN_ZVAL(method, 1, 0);
 	}
 }
 /* }}} */
@@ -1033,11 +1017,7 @@ PHP_METHOD(HttpRequest, setContentType)
 		RETURN_FALSE;
 	}
 
-	if (!strchr(ctype, '/')) {
-		http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Content-Type '%s' doesn't seem to contain a primary and a secondary part", ctype);
-		RETURN_FALSE;
-	}
-
+	HTTP_CHECK_CONTENT_TYPE(ctype, RETURN_FALSE);
 	UPD_STRL(obj, contentType, ctype, ct_len);
 	RETURN_TRUE;
 }
@@ -1094,8 +1074,13 @@ PHP_METHOD(HttpRequest, setQueryData)
 		UPD_PROP(obj, string, queryData, query_data);
 		efree(query_data);
 	} else {
+		zval *orig = qdata;
+		
 		convert_to_string_ex(&qdata);
 		UPD_STRL(obj, queryData, Z_STRVAL_P(qdata), Z_STRLEN_P(qdata));
+		if (orig != qdata) {
+			zval_ptr_dtor(&qdata);
+		}
 	}
 	RETURN_TRUE;
 }
@@ -1113,7 +1098,7 @@ PHP_METHOD(HttpRequest, getQueryData)
 
 	IF_RETVAL_USED {
 		getObject(http_request_object, obj);
-		zval *qdata = convert_to_type_ex(IS_STRING, GET_PROP(obj, queryData));
+		zval *qdata = GET_PROP(obj, queryData);
 		
 		RETURN_ZVAL(qdata, 1, 0);
 	}
@@ -1136,11 +1121,11 @@ PHP_METHOD(HttpRequest, addQueryData)
 	size_t query_data_len = 0;
 	getObject(http_request_object, obj);
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &qdata)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &qdata)) {
 		RETURN_FALSE;
 	}
 
-	old_qdata = convert_to_type_ex(IS_STRING, GET_PROP(obj, queryData));
+	old_qdata = GET_PROP(obj, queryData);
 
 	if (SUCCESS != http_urlencode_hash_ex(HASH_OF(qdata), 1, Z_STRVAL_P(old_qdata), Z_STRLEN_P(old_qdata), &query_data, &query_data_len)) {
 		RETURN_FALSE;
@@ -1165,16 +1150,25 @@ PHP_METHOD(HttpRequest, addQueryData)
  */
 PHP_METHOD(HttpRequest, addPostFields)
 {
-	zval *post, *post_data;
+	zval *post_data, *old_post, *new_post;
 	getObject(http_request_object, obj);
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &post_data)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &post_data)) {
 		RETURN_FALSE;
 	}
 
-	post = convert_to_type(IS_ARRAY, GET_PROP(obj, postFields));
-	array_merge(post_data, post);
-
+	if (zend_hash_num_elements(Z_ARRVAL_P(post_data))) {
+		MAKE_STD_ZVAL(new_post);
+		array_init(new_post);
+		old_post = GET_PROP(obj, postFields);
+		if (Z_TYPE_P(old_post) == IS_ARRAY) {
+			array_copy(old_post, new_post);
+		}
+		array_merge(post_data, new_post);
+		SET_PROP(obj, postFields, new_post);
+		zval_ptr_dtor(&new_post);
+	}
+	
 	RETURN_TRUE;
 }
 /* }}} */
@@ -1194,16 +1188,17 @@ PHP_METHOD(HttpRequest, setPostFields)
 	zval *post, *post_data = NULL;
 	getObject(http_request_object, obj);
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!", &post_data)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!", &post_data)) {
 		RETURN_FALSE;
 	}
 
-	post = convert_to_type(IS_ARRAY, GET_PROP(obj, postFields));
-	zend_hash_clean(Z_ARRVAL_P(post));
-	
+	MAKE_STD_ZVAL(post);
+	array_init(post);
 	if (post_data && zend_hash_num_elements(Z_ARRVAL_P(post_data))) {
 		array_copy(post_data, post);
 	}
+	SET_PROP(obj, postFields, post);
+	zval_ptr_dtor(&post);
 
 	RETURN_TRUE;
 }
@@ -1221,10 +1216,9 @@ PHP_METHOD(HttpRequest, getPostFields)
 
 	IF_RETVAL_USED {
 		getObject(http_request_object, obj);
-		zval *post_data = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, postFields));
+		zval *post = GET_PROP(obj, postFields);
 		
-		array_init(return_value);
-		array_copy(post_data, return_value);
+		RETURN_ZVAL(post, 1, 0);
 	}
 }
 /* }}} */
@@ -1271,7 +1265,7 @@ PHP_METHOD(HttpRequest, setRawPostData)
  */
 PHP_METHOD(HttpRequest, addRawPostData)
 {
-	char *raw_data, *new_data;
+	char *raw_data;
 	int data_len;
 	getObject(http_request_object, obj);
 	
@@ -1280,17 +1274,18 @@ PHP_METHOD(HttpRequest, addRawPostData)
 	}
 	
 	if (data_len) {
-		zval *zdata = convert_to_type_ex(IS_STRING, GET_PROP(obj, rawPostData));
-		
-		new_data = emalloc(Z_STRLEN_P(zdata) + data_len + 1);
-		new_data[Z_STRLEN_P(zdata) + data_len] = '\0';
-		
-		if (Z_STRLEN_P(zdata)) {
-			memcpy(new_data, Z_STRVAL_P(zdata), Z_STRLEN_P(zdata));
-		}
+		zval *data, *zdata = GET_PROP(obj, rawPostData);
 		
-		memcpy(new_data + Z_STRLEN_P(zdata), raw_data, data_len);
-		UPD_STRL(obj, rawPostData, new_data, Z_STRLEN_P(zdata) + data_len);
+		ALLOC_ZVAL(data);
+		*data = *zdata;
+		zval_copy_ctor(data);
+		INIT_PZVAL(data);
+		convert_to_string(data);
+		Z_STRVAL_P(data) = erealloc(Z_STRVAL_P(data), (Z_STRLEN_P(data) += data_len) + 1);
+		Z_STRVAL_P(data)[Z_STRLEN_P(data)] = '\0';
+		memcpy(Z_STRVAL_P(data) + Z_STRLEN_P(data) - data_len, raw_data, data_len);
+		SET_PROP(obj, rawPostData, data);
+		zval_ptr_dtor(&data);
 	}
 	
 	RETURN_TRUE;
@@ -1309,9 +1304,9 @@ PHP_METHOD(HttpRequest, getRawPostData)
 	
 	IF_RETVAL_USED {
 		getObject(http_request_object, obj);
-		zval *raw_data = convert_to_type_ex(IS_STRING, GET_PROP(obj, rawPostData));
+		zval *post = GET_PROP(obj, rawPostData);
 		
-		RETURN_ZVAL(raw_data, 1, 0);
+		RETURN_ZVAL(post, 1, 0);
 	}
 }
 /* }}} */
@@ -1331,7 +1326,7 @@ PHP_METHOD(HttpRequest, getRawPostData)
  */
 PHP_METHOD(HttpRequest, addPostFile)
 {
-	zval *files, *entry;
+	zval *entry, *old_post, *new_post;
 	char *name, *file, *type = NULL;
 	int name_len, file_len, type_len = 0;
 	getObject(http_request_object, obj);
@@ -1341,10 +1336,7 @@ PHP_METHOD(HttpRequest, addPostFile)
 	}
 
 	if (type_len) {
-		if (!strchr(type, '/')) {
-			http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Content-Type '%s' doesn't seem to contain a primary and a secondary part", type);
-			RETURN_FALSE;
-		}
+		HTTP_CHECK_CONTENT_TYPE(type, RETURN_FALSE);
 	} else {
 		type = "application/x-octetstream";
 		type_len = sizeof("application/x-octetstream") - 1;
@@ -1357,8 +1349,15 @@ PHP_METHOD(HttpRequest, addPostFile)
 	add_assoc_stringl(entry, "type", type, type_len, 1);
 	add_assoc_stringl(entry, "file", file, file_len, 1);
 
-	files = convert_to_type(IS_ARRAY, GET_PROP(obj, postFiles));
-	add_next_index_zval(files, entry);
+	MAKE_STD_ZVAL(new_post);
+	array_init(new_post);
+	old_post = GET_PROP(obj, postFiles);
+	if (Z_TYPE_P(old_post) == IS_ARRAY) {
+		array_copy(old_post, new_post);
+	}
+	add_next_index_zval(new_post, entry);
+	SET_PROP(obj, postFiles, new_post);
+	zval_ptr_dtor(&new_post);
 
 	RETURN_TRUE;
 }
@@ -1377,19 +1376,19 @@ PHP_METHOD(HttpRequest, addPostFile)
  */
 PHP_METHOD(HttpRequest, setPostFiles)
 {
-	zval *files, *pFiles;
+	zval *files = NULL, *post;
 	getObject(http_request_object, obj);
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &files)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!/", &files)) {
 		RETURN_FALSE;
 	}
 
-	pFiles = convert_to_type(IS_ARRAY, GET_PROP(obj, postFiles));
-	zend_hash_clean(Z_ARRVAL_P(pFiles));
-	
-	if (files && zend_hash_num_elements(Z_ARRVAL_P(files))) {
-		array_copy(files, pFiles);
+	MAKE_STD_ZVAL(post);
+	array_init(post);
+	if (files && (Z_TYPE_P(files) == IS_ARRAY)) {
+		array_copy(files, post);
 	}
+	SET_PROP(obj, postFiles, post);
 
 	RETURN_TRUE;
 }
@@ -1407,10 +1406,9 @@ PHP_METHOD(HttpRequest, getPostFiles)
 
 	IF_RETVAL_USED {
 		getObject(http_request_object, obj);
-		zval *files = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, postFiles));
 
 		array_init(return_value);
-		array_copy(files, return_value);
+		array_copy(GET_PROP(obj, postFiles), return_value);
 	}
 }
 /* }}} */
@@ -1451,9 +1449,9 @@ PHP_METHOD(HttpRequest, getPutFile)
 
 	IF_RETVAL_USED {
 		getObject(http_request_object, obj);
-		zval *putfile = convert_to_type_ex(IS_STRING, GET_PROP(obj, putFile));
+		zval *file = GET_PROP(obj, putFile);
 		
-		RETURN_ZVAL(putfile, 1, 0);
+		RETVAL_ZVAL(file, 1, 0);
 	}
 }
 /* }}} */
@@ -1475,10 +1473,9 @@ PHP_METHOD(HttpRequest, getResponseData)
 
 	IF_RETVAL_USED {
 		getObject(http_request_object, obj);
-		zval *data = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, responseData));
 		
 		array_init(return_value);
-		array_copy(data, return_value);
+		array_copy(GET_PROP(obj, responseData), return_value);
 	}
 }
 /* }}} */
@@ -1508,18 +1505,18 @@ PHP_METHOD(HttpRequest, getResponseHeader)
 			RETURN_FALSE;
 		}
 
-		data = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, responseData));
-		if (SUCCESS != zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) {
-			RETURN_FALSE;
-		}
-		convert_to_array_ex(headers);
-		if (!header_len || !header_name) {
-			array_init(return_value);
-			array_copy(*headers, return_value);
-		} else if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(headers), pretty_key(header_name, header_len, 1, 1), header_len + 1, (void **) &header)) {
-			RETURN_ZVAL(*header, 1, 0);
+		data = GET_PROP(obj, responseData);
+		if (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) {
+			convert_to_array(*headers);
+			if (!header_len || !header_name) {
+				RETVAL_ZVAL(*headers, 1, 0);
+			} else if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(headers), pretty_key(header_name, header_len, 1, 1), header_len + 1, (void **) &header)) {
+				RETVAL_ZVAL(*header, 1, 0);
+			} else {
+				RETVAL_FALSE;
+			}
 		} else {
-			RETURN_FALSE;
+			RETVAL_FALSE;
 		}
 	}
 }
@@ -1554,20 +1551,22 @@ PHP_METHOD(HttpRequest, getResponseCookie)
 
 		array_init(return_value);
 
-		data = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, responseData));
+		data = GET_PROP(obj, responseData);
 		if (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) {
 			ulong idx = 0;
 			char *key = NULL;
 			zval **header = NULL;
+			HashPosition pos1;
 
-			convert_to_array_ex(headers);
-			FOREACH_HASH_KEYVAL(Z_ARRVAL_PP(headers), key, idx, header) {
+			convert_to_array(*headers);
+			FOREACH_HASH_KEYVAL(pos1, Z_ARRVAL_PP(headers), key, idx, header) {
 				if (key && !strcasecmp(key, "Set-Cookie")) {
 					/* several cookies? */
 					if (Z_TYPE_PP(header) == IS_ARRAY) {
 						zval **cookie;
+						HashPosition pos2;
 
-						FOREACH_HASH_VAL(Z_ARRVAL_PP(header), cookie) {
+						FOREACH_HASH_VAL(pos2, Z_ARRVAL_PP(header), cookie) {
 							zval *cookie_hash;
 							MAKE_STD_ZVAL(cookie_hash);
 							array_init(cookie_hash);
@@ -1644,10 +1643,9 @@ PHP_METHOD(HttpRequest, getResponseBody)
 	IF_RETVAL_USED {
 		zval **body;
 		getObject(http_request_object, obj);
-		zval *data = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, responseData));
+		zval *data = GET_PROP(obj, responseData);
 		
 		if (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "body", sizeof("body"), (void **) &body)) {
-			convert_to_string_ex(body);
 			RETURN_ZVAL(*body, 1, 0);
 		} else {
 			RETURN_FALSE;
@@ -1671,9 +1669,9 @@ PHP_METHOD(HttpRequest, getResponseCode)
 
 	IF_RETVAL_USED {
 		getObject(http_request_object, obj);
-		zval *code = convert_to_type_ex(IS_LONG, GET_PROP(obj, responseCode));
+		zval *code = GET_PROP(obj, responseCode);
 		
-		RETURN_ZVAL(code, 1, 0);
+		RETVAL_ZVAL(code, 1, 0);
 	}
 }
 /* }}} */
@@ -1706,7 +1704,7 @@ PHP_METHOD(HttpRequest, getResponseInfo)
 			RETURN_FALSE;
 		}
 
-		info = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, responseInfo));
+		info = GET_PROP(obj, responseInfo);
 
 		if (info_len && info_name) {
 			if (SUCCESS == zend_hash_find(Z_ARRVAL_P(info), pretty_key(info_name, info_len, 0, 0), info_len + 1, (void **) &infop)) {
@@ -1716,8 +1714,7 @@ PHP_METHOD(HttpRequest, getResponseInfo)
 				RETURN_FALSE;
 			}
 		} else {
-			array_init(return_value);
-			array_copy(info, return_value);
+			RETURN_ZVAL(info, 1, 0);
 		}
 	}
 }
@@ -1766,6 +1763,13 @@ PHP_METHOD(HttpRequest, getResponseMessage)
  * references the last received response.  Use HttpMessage::getParentMessage()
  * to access the data of previously sent requests whithin this request
  * cycle.
+ * 
+ * Note that the internal request message is immutable, that means that the
+ * request message received through HttpRequest::getRequestMessage() will
+ * always look the same for the same request, regardless of any changes you
+ * may have made to the returned object.
+ * 
+ * Throws HttpMalformedHeadersException, HttpEncodingException.
  */
 PHP_METHOD(HttpRequest, getRequestMessage)
 {
@@ -1776,14 +1780,52 @@ PHP_METHOD(HttpRequest, getRequestMessage)
 		getObject(http_request_object, obj);
 
 		SET_EH_THROW_HTTP();
-		if (msg = http_message_parse(PHPSTR_VAL(&obj->request), PHPSTR_LEN(&obj->request))) {
-			RETVAL_OBJVAL(http_message_object_from_msg(msg));
+		if ((msg = http_message_parse(PHPSTR_VAL(&obj->request->conv.request), PHPSTR_LEN(&obj->request->conv.request)))) {
+			ZVAL_OBJVAL(return_value, http_message_object_new_ex(http_message_object_ce, msg, NULL));
 		}
 		SET_EH_NORMAL();
 	}
 }
 /* }}} */
 
+/* {{{ proto string HttpRequest::getRawRequestMessage()
+ *
+ * Get sent HTTP message.
+ * 
+ * Returns an HttpMessage in a form of a string 
+ * 
+ */
+PHP_METHOD(HttpRequest, getRawRequestMessage)
+{
+	NO_ARGS;
+
+	IF_RETVAL_USED {
+		getObject(http_request_object, obj);
+
+		RETURN_PHPSTR_DUP(&obj->request->conv.request);
+	}
+}
+/* }}} */
+
+/* {{{ proto string HttpRequest::getRawResponseMessage()
+ *
+ * Get the entire HTTP response.
+ * 
+ * Returns the complete web server response, including the headers in a form of a string.
+ * 
+ */
+PHP_METHOD(HttpRequest, getRawResponseMessage)
+{
+	NO_ARGS;
+
+	IF_RETVAL_USED {
+		getObject(http_request_object, obj);
+
+		RETURN_PHPSTR_DUP(&obj->request->conv.response);
+	}
+}
+/* }}} */
+
 /* {{{ proto HttpMessage HttpRequest::getHistory()
  *
  * Get all sent requests and received responses as an HttpMessage object.
@@ -1797,7 +1839,11 @@ PHP_METHOD(HttpRequest, getRequestMessage)
  * The object references the last received response, use HttpMessage::getParentMessage() 
  * to access the data of previously sent requests and received responses.
  * 
- * Throws HttpMalformedHeaderException.
+ * Note that the internal history is immutable, that means that any changes
+ * you make the the message list won't affect a history message list newly 
+ * created by another call to HttpRequest::getHistory().
+ * 
+ * Throws HttpMalformedHeaderException, HttpEncodingException.
  */
 PHP_METHOD(HttpRequest, getHistory)
 {
@@ -1808,8 +1854,8 @@ PHP_METHOD(HttpRequest, getHistory)
 		getObject(http_request_object, obj);
 
 		SET_EH_THROW_HTTP();
-		if (msg = http_message_parse(PHPSTR_VAL(&obj->history), PHPSTR_LEN(&obj->history))) {
-			RETVAL_OBJVAL(http_message_object_from_msg(msg));
+		if ((msg = http_message_parse(PHPSTR_VAL(&obj->history), PHPSTR_LEN(&obj->history)))) {
+			ZVAL_OBJVAL(return_value, http_message_object_new_ex(http_message_object_ce, msg, NULL));
 		}
 		SET_EH_NORMAL();
 	}
@@ -1835,13 +1881,17 @@ PHP_METHOD(HttpRequest, clearHistory)
  * 
  * Returns the received response as HttpMessage object.
  * 
+ * NOTE: While an exception may be thrown, the transfer could have succeeded 
+ * at least partially, so you might want to check the return values of various
+ * HttpRequest::getResponse*() methods.
+ * 
  * Throws HttpRuntimeException, HttpRequestException, 
  * HttpMalformedHeaderException, HttpEncodingException.
  *
  * GET example:
  * <pre>
  * <?php
- * $r = new HttpRequest('http://example.com/feed.rss', HTTP_GET);
+ * $r = new HttpRequest('http://example.com/feed.rss', HttpRequest::METH_GET);
  * $r->setOptions(array('lastmodified' => filemtime('local.rss')));
  * $r->addQueryData(array('category' => 3));
  * try {
@@ -1858,7 +1908,7 @@ PHP_METHOD(HttpRequest, clearHistory)
  * POST example:
  * <pre>
  * <?php
- * $r = new HttpRequest('http://example.com/form.php', HTTP_POST);
+ * $r = new HttpRequest('http://example.com/form.php', HttpRequest::METH_POST);
  * $r->setOptions(array('cookies' => array('lang' => 'de')));
  * $r->addPostFields(array('user' => 'mike', 'pass' => 's3c|r3t'));
  * $r->addPostFile('image', 'profile.jpg', 'image/jpeg');
@@ -1872,27 +1922,22 @@ PHP_METHOD(HttpRequest, clearHistory)
  */
 PHP_METHOD(HttpRequest, send)
 {
-	http_request_body body = {0, NULL, 0};
 	getObject(http_request_object, obj);
 
 	NO_ARGS;
 
 	SET_EH_THROW_HTTP();
 
+	RETVAL_FALSE;
+	
 	if (obj->pool) {
 		http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot perform HttpRequest::send() while attached to an HttpRequestPool");
-		SET_EH_NORMAL();
-		RETURN_FALSE;
-	}
-
-	RETVAL_NULL();
-	
-	if (	(SUCCESS == http_request_object_requesthandler(obj, getThis(), &body)) &&
-			(SUCCESS == http_request_exec(obj->ch, NULL, &obj->response, &obj->request)) &&
-			(SUCCESS == http_request_object_responsehandler(obj, getThis()))) {
-		RETVAL_OBJECT(GET_PROP(obj, responseMessage));
+	} else if (SUCCESS == http_request_object_requesthandler(obj, getThis())) {
+		http_request_exec(obj->request);
+		if (SUCCESS == http_request_object_responsehandler(obj, getThis())) {
+			RETVAL_OBJECT(GET_PROP(obj, responseMessage));
+		}
 	}
-	http_request_body_dtor(&body);
 
 	SET_EH_NORMAL();
 }