X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_object.c;h=c56562a0af9cdcf9c41f0cce33ff6394ea829eba;hp=aef84e9de495ba9494c44d94806203a3f00618bd;hb=0e0def98a4ea4463bf8c21c6f161b2b37aa8c49d;hpb=e83a7438dc70ed96630887246a1d3aefcf155b1c

diff --git a/http_request_object.c b/http_request_object.c
index aef84e9..c56562a 100644
--- a/http_request_object.c
+++ b/http_request_object.c
@@ -6,231 +6,251 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, 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 "zend_interfaces.h"
 
-#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 "php_http_api.h"
-#include "php_http_url_api.h"
+#include "php_http_cookie_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))
+#define HTTP_BEGIN_ARGS(method, req_args) 	HTTP_BEGIN_ARGS_EX(HttpRequest, method, 0, req_args)
+#define HTTP_EMPTY_ARGS(method)				HTTP_EMPTY_ARGS_EX(HttpRequest, method, 0)
+#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_BEGIN_ARGS(__construct, 0)
 	HTTP_ARG_VAL(url, 0)
 	HTTP_ARG_VAL(method, 0)
 	HTTP_ARG_VAL(options, 0)
 HTTP_END_ARGS;
 
-HTTP_EMPTY_ARGS(getOptions, 0);
-HTTP_BEGIN_ARGS(setOptions, 0, 0)
+HTTP_EMPTY_ARGS(getOptions);
+HTTP_BEGIN_ARGS(setOptions, 0)
 	HTTP_ARG_VAL(options, 0)
 HTTP_END_ARGS;
 
-HTTP_EMPTY_ARGS(getSslOptions, 0);
-HTTP_BEGIN_ARGS(setSslOptions, 0, 0)
+HTTP_EMPTY_ARGS(getSslOptions);
+HTTP_BEGIN_ARGS(setSslOptions, 0)
 	HTTP_ARG_VAL(ssl_options, 0)
 HTTP_END_ARGS;
 
-HTTP_EMPTY_ARGS(getHeaders, 0);
-HTTP_BEGIN_ARGS(setHeaders, 0, 0)
+HTTP_BEGIN_ARGS(addSslOptions, 0)
+	HTTP_ARG_VAL(ssl_optins, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getHeaders);
+HTTP_BEGIN_ARGS(setHeaders, 0)
 	HTTP_ARG_VAL(headers, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(addHeaders, 0, 1)
+HTTP_BEGIN_ARGS(addHeaders, 1)
 	HTTP_ARG_VAL(headers, 0)
 HTTP_END_ARGS;
 
-HTTP_EMPTY_ARGS(getCookies, 0);
-HTTP_BEGIN_ARGS(setCookies, 0, 0)
+HTTP_EMPTY_ARGS(getCookies);
+HTTP_BEGIN_ARGS(setCookies, 0)
 	HTTP_ARG_VAL(cookies, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(addCookies, 0, 1)
+HTTP_BEGIN_ARGS(addCookies, 1)
 	HTTP_ARG_VAL(cookies, 0)
 HTTP_END_ARGS;
 
-HTTP_EMPTY_ARGS(getUrl, 0);
-HTTP_BEGIN_ARGS(setUrl, 0, 1)
+HTTP_EMPTY_ARGS(enableCookies);
+#if HTTP_CURL_VERSION(7,14,1)
+HTTP_BEGIN_ARGS(resetCookies, 0)
+	HTTP_ARG_VAL(session_only, 0)
+HTTP_END_ARGS;
+#endif
+
+HTTP_EMPTY_ARGS(getUrl);
+HTTP_BEGIN_ARGS(setUrl, 1)
 	HTTP_ARG_VAL(url, 0)
 HTTP_END_ARGS;
 
-HTTP_EMPTY_ARGS(getMethod, 0);
-HTTP_BEGIN_ARGS(setMethod, 0, 1)
+HTTP_EMPTY_ARGS(getMethod);
+HTTP_BEGIN_ARGS(setMethod, 1)
 	HTTP_ARG_VAL(request_method, 0)
 HTTP_END_ARGS;
 
-HTTP_EMPTY_ARGS(getContentType, 0);
-HTTP_BEGIN_ARGS(setContentType, 0, 1)
+HTTP_EMPTY_ARGS(getContentType);
+HTTP_BEGIN_ARGS(setContentType, 1)
 	HTTP_ARG_VAL(content_type, 0)
 HTTP_END_ARGS;
 
-HTTP_EMPTY_ARGS(getQueryData, 0);
-HTTP_BEGIN_ARGS(setQueryData, 0, 0)
+HTTP_EMPTY_ARGS(getQueryData);
+HTTP_BEGIN_ARGS(setQueryData, 0)
 	HTTP_ARG_VAL(query_data, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(addQueryData, 0, 1)
+HTTP_BEGIN_ARGS(addQueryData, 1)
 	HTTP_ARG_VAL(query_data, 0)
 HTTP_END_ARGS;
 
-HTTP_EMPTY_ARGS(getPostFields, 0);
-HTTP_BEGIN_ARGS(setPostFields, 0, 0)
+HTTP_EMPTY_ARGS(getPostFields);
+HTTP_BEGIN_ARGS(setPostFields, 0)
 	HTTP_ARG_VAL(post_fields, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(addPostFields, 0, 1)
+HTTP_BEGIN_ARGS(addPostFields, 1)
 	HTTP_ARG_VAL(post_fields, 0)
 HTTP_END_ARGS;
 
-HTTP_EMPTY_ARGS(getPostFiles, 0);
-HTTP_BEGIN_ARGS(setPostFiles, 0, 0)
+HTTP_EMPTY_ARGS(getPostFiles);
+HTTP_BEGIN_ARGS(setPostFiles, 0)
 	HTTP_ARG_VAL(post_files, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(addPostFile, 0, 2)
+HTTP_BEGIN_ARGS(addPostFile, 2)
 	HTTP_ARG_VAL(formname, 0)
 	HTTP_ARG_VAL(filename, 0)
 	HTTP_ARG_VAL(content_type, 0)
 HTTP_END_ARGS;
 
-HTTP_EMPTY_ARGS(getRawPostData, 0);
-HTTP_BEGIN_ARGS(setRawPostData, 0, 0)
+HTTP_EMPTY_ARGS(getRawPostData);
+HTTP_BEGIN_ARGS(setRawPostData, 0)
 	HTTP_ARG_VAL(raw_post_data, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(addRawPostData, 0, 1)
+HTTP_BEGIN_ARGS(addRawPostData, 1)
 	HTTP_ARG_VAL(raw_post_data, 0)
 HTTP_END_ARGS;
 
-HTTP_EMPTY_ARGS(getPutFile, 0);
-HTTP_BEGIN_ARGS(setPutFile, 0, 0)
+HTTP_EMPTY_ARGS(getPutFile);
+HTTP_BEGIN_ARGS(setPutFile, 0)
 	HTTP_ARG_VAL(filename, 0)
 HTTP_END_ARGS;
 
-HTTP_EMPTY_ARGS(getResponseData, 0);
-HTTP_BEGIN_ARGS(getResponseHeader, 0, 0)
-	HTTP_ARG_VAL(name, 0)
+HTTP_EMPTY_ARGS(getPutData);
+HTTP_BEGIN_ARGS(setPutData, 0)
+	HTTP_ARG_VAL(put_data, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(getResponseCookie, 0, 0)
+HTTP_BEGIN_ARGS(addPutData, 1)
+	HTTP_ARG_VAL(put_data, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getResponseData);
+HTTP_BEGIN_ARGS(getResponseHeader, 0)
 	HTTP_ARG_VAL(name, 0)
 HTTP_END_ARGS;
 
-HTTP_EMPTY_ARGS(getResponseBody, 0);
-HTTP_EMPTY_ARGS(getResponseCode, 0);
-HTTP_BEGIN_ARGS(getResponseInfo, 0, 0)
+HTTP_BEGIN_ARGS(getResponseCookies, 0)
+	HTTP_ARG_VAL(flags, 0)
+	HTTP_ARG_VAL(allowed_extras, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getResponseBody);
+HTTP_EMPTY_ARGS(getResponseCode);
+HTTP_EMPTY_ARGS(getResponseStatus);
+HTTP_BEGIN_ARGS(getResponseInfo, 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(clearHistory, 0);
-HTTP_EMPTY_ARGS(send, 1);
+HTTP_EMPTY_ARGS(getResponseMessage);
+HTTP_EMPTY_ARGS(getRawResponseMessage);
+HTTP_EMPTY_ARGS(getRequestMessage);
+HTTP_EMPTY_ARGS(getRawRequestMessage);
+HTTP_EMPTY_ARGS(getHistory);
+HTTP_EMPTY_ARGS(clearHistory);
+HTTP_EMPTY_ARGS(send);
 
-HTTP_BEGIN_ARGS(get, 0, 1)
+HTTP_BEGIN_ARGS(get, 1)
 	HTTP_ARG_VAL(url, 0)
 	HTTP_ARG_VAL(options, 0)
 	HTTP_ARG_VAL(info, 1)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(head, 0, 1)
+HTTP_BEGIN_ARGS(head, 1)
 	HTTP_ARG_VAL(url, 0)
 	HTTP_ARG_VAL(options, 0)
 	HTTP_ARG_VAL(info, 1)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(postData, 0, 2)
+HTTP_BEGIN_ARGS(postData, 2)
 	HTTP_ARG_VAL(url, 0)
 	HTTP_ARG_VAL(data, 0)
 	HTTP_ARG_VAL(options, 0)
 	HTTP_ARG_VAL(info, 1)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(postFields, 0, 2)
+HTTP_BEGIN_ARGS(postFields, 2)
 	HTTP_ARG_VAL(url, 0)
 	HTTP_ARG_VAL(data, 0)
 	HTTP_ARG_VAL(options, 0)
 	HTTP_ARG_VAL(info, 1)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(putFile, 0, 2)
+HTTP_BEGIN_ARGS(putData, 2)
+	HTTP_ARG_VAL(url, 0)
+	HTTP_ARG_VAL(data, 0)
+	HTTP_ARG_VAL(options, 0)
+	HTTP_ARG_VAL(info, 1)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(putFile, 2)
 	HTTP_ARG_VAL(url, 0)
 	HTTP_ARG_VAL(file, 0)
 	HTTP_ARG_VAL(options, 0)
 	HTTP_ARG_VAL(info, 1)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(putStream, 0, 2)
+HTTP_BEGIN_ARGS(putStream, 2)
 	HTTP_ARG_VAL(url, 0)
 	HTTP_ARG_VAL(stream, 0)
 	HTTP_ARG_VAL(options, 0)
 	HTTP_ARG_VAL(info, 1)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(methodRegister, 0, 1)
+HTTP_BEGIN_ARGS(methodRegister, 1)
 	HTTP_ARG_VAL(method_name, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(methodUnregister, 0, 1)
+HTTP_BEGIN_ARGS(methodUnregister, 1)
 	HTTP_ARG_VAL(method, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(methodName, 0, 1)
+HTTP_BEGIN_ARGS(methodName, 1)
 	HTTP_ARG_VAL(method_id, 0)
 HTTP_END_ARGS;
 
-HTTP_BEGIN_ARGS(methodExists, 0, 1)
+HTTP_BEGIN_ARGS(methodExists, 1)
 	HTTP_ARG_VAL(method, 0)
 HTTP_END_ARGS;
 
-#define http_request_object_declare_default_properties() _http_request_object_declare_default_properties(TSRMLS_C)
-static inline void _http_request_object_declare_default_properties(TSRMLS_D);
-#define http_request_object_clone_obj _http_request_object_clone_obj
-static inline zend_object_value _http_request_object_clone_obj(zval *object TSRMLS_DC);
+#ifdef HAVE_CURL_GETFORMDATA
+HTTP_BEGIN_ARGS(encodeBody, 2)
+	HTTP_ARG_VAL(fields, 0)
+	HTTP_ARG_VAL(files, 0)
+HTTP_END_ARGS;
+#endif
 
+#define OBJ_PROP_CE http_request_object_ce
 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)
 	HTTP_REQUEST_ME(setSslOptions, ZEND_ACC_PUBLIC)
 	HTTP_REQUEST_ME(getSslOptions, ZEND_ACC_PUBLIC)
+	HTTP_REQUEST_ME(addSslOptions, ZEND_ACC_PUBLIC)
 
 	HTTP_REQUEST_ME(addHeaders, ZEND_ACC_PUBLIC)
 	HTTP_REQUEST_ME(getHeaders, ZEND_ACC_PUBLIC)
@@ -240,6 +260,11 @@ zend_function_entry http_request_object_fe[] = {
 	HTTP_REQUEST_ME(getCookies, ZEND_ACC_PUBLIC)
 	HTTP_REQUEST_ME(setCookies, ZEND_ACC_PUBLIC)
 
+	HTTP_REQUEST_ME(enableCookies, ZEND_ACC_PUBLIC)
+#if HTTP_CURL_VERSION(7,14,1)
+	HTTP_REQUEST_ME(resetCookies, ZEND_ACC_PUBLIC)
+#endif
+
 	HTTP_REQUEST_ME(setMethod, ZEND_ACC_PUBLIC)
 	HTTP_REQUEST_ME(getMethod, ZEND_ACC_PUBLIC)
 
@@ -268,16 +293,23 @@ zend_function_entry http_request_object_fe[] = {
 	HTTP_REQUEST_ME(setPutFile, ZEND_ACC_PUBLIC)
 	HTTP_REQUEST_ME(getPutFile, ZEND_ACC_PUBLIC)
 
+	HTTP_REQUEST_ME(setPutData, ZEND_ACC_PUBLIC)
+	HTTP_REQUEST_ME(getPutData, ZEND_ACC_PUBLIC)
+	HTTP_REQUEST_ME(addPutData, ZEND_ACC_PUBLIC)
+
 	HTTP_REQUEST_ME(send, ZEND_ACC_PUBLIC)
 
 	HTTP_REQUEST_ME(getResponseData, ZEND_ACC_PUBLIC)
 	HTTP_REQUEST_ME(getResponseHeader, ZEND_ACC_PUBLIC)
-	HTTP_REQUEST_ME(getResponseCookie, ZEND_ACC_PUBLIC)
+	HTTP_REQUEST_ME(getResponseCookies, ZEND_ACC_PUBLIC)
 	HTTP_REQUEST_ME(getResponseCode, ZEND_ACC_PUBLIC)
+	HTTP_REQUEST_ME(getResponseStatus, ZEND_ACC_PUBLIC)
 	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)
 
@@ -285,6 +317,7 @@ zend_function_entry http_request_object_fe[] = {
 	HTTP_REQUEST_ALIAS(head, http_head)
 	HTTP_REQUEST_ALIAS(postData, http_post_data)
 	HTTP_REQUEST_ALIAS(postFields, http_post_fields)
+	HTTP_REQUEST_ALIAS(putData, http_put_data)
 	HTTP_REQUEST_ALIAS(putFile, http_put_file)
 	HTTP_REQUEST_ALIAS(putStream, http_put_stream)
 
@@ -292,7 +325,9 @@ zend_function_entry http_request_object_fe[] = {
 	HTTP_REQUEST_ALIAS(methodUnregister, http_request_method_unregister)
 	HTTP_REQUEST_ALIAS(methodName, http_request_method_name)
 	HTTP_REQUEST_ALIAS(methodExists, http_request_method_exists)
-
+#ifdef HAVE_CURL_GETFORMDATA
+	HTTP_REQUEST_ALIAS(encodeBody, http_request_body_encode)
+#endif
 	EMPTY_FUNCTION_ENTRY
 };
 static zend_object_handlers http_request_object_handlers;
@@ -300,59 +335,29 @@ static zend_object_handlers http_request_object_handlers;
 PHP_MINIT_FUNCTION(http_request_object)
 {
 	HTTP_REGISTER_CLASS_EX(HttpRequest, http_request_object, NULL, 0);
-	http_request_object_handlers.clone_obj = NULL;
-	return SUCCESS;
-}
-
-zend_object_value _http_request_object_new(zend_class_entry *ce 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();
-
-	phpstr_init(&o->history);
-	phpstr_init(&o->request);
-	phpstr_init_ex(&o->response, HTTP_CURLBUF_SIZE, 0);
-
-	ALLOC_HASHTABLE(OBJ_PROP(o));
-	zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
-	zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
-
-	ov.handle = putObject(http_request_object, o);
-	ov.handlers = &http_request_object_handlers;
-
-	return 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);
+	http_request_object_handlers.clone_obj = _http_request_object_clone_obj;
+
+	DCL_PROP_N(PRIVATE, options);
+	DCL_PROP_N(PRIVATE, postFields);
+	DCL_PROP_N(PRIVATE, postFiles);
+	DCL_PROP_N(PRIVATE, responseInfo);
+	DCL_PROP_N(PRIVATE, responseMessage);
+	DCL_PROP(PRIVATE, long, responseCode, 0);
+	DCL_PROP(PRIVATE, string, responseStatus, "");
+	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(PRIVATE, string, putData, "");
+	DCL_PROP_N(PRIVATE, history);
+	DCL_PROP(PUBLIC, bool, recordHistory, 0);
 
 #ifndef WONKY
 	/*
 	 * Request Method Constants
-	 */
+	*/
 	/* HTTP/1.1 */
 	DCL_CONST(long, "METH_GET", HTTP_GET);
 	DCL_CONST(long, "METH_HEAD", HTTP_HEAD);
@@ -386,242 +391,386 @@ static inline void _http_request_object_declare_default_properties(TSRMLS_D)
 	DCL_CONST(long, "METH_ACL", HTTP_ACL);
 
 	/*
-	 * Auth Constants
-	 */
-#	if LIBCURL_VERSION_NUM >= 0x070a05
+	* HTTP Protocol Version Constants
+	*/
+	DCL_CONST(long, "VERSION_1_0", CURL_HTTP_VERSION_1_0);
+	DCL_CONST(long, "VERSION_1_1", CURL_HTTP_VERSION_1_1);
+	DCL_CONST(long, "VERSION_NONE", CURL_HTTP_VERSION_NONE); /* to be removed */
+	DCL_CONST(long, "VERSION_ANY", CURL_HTTP_VERSION_NONE);
+
+	/*
+	* SSL Version Constants
+	*/
+	DCL_CONST(long, "SSL_VERSION_TLSv1", CURL_SSLVERSION_TLSv1);
+	DCL_CONST(long, "SSL_VERSION_SSLv2", CURL_SSLVERSION_SSLv2);
+	DCL_CONST(long, "SSL_VERSION_SSLv3", CURL_SSLVERSION_SSLv3);
+	DCL_CONST(long, "SSL_VERSION_ANY", CURL_SSLVERSION_DEFAULT);
+
+	/*
+	* DNS IPvX resolving
+	*/
+	DCL_CONST(long, "IPRESOLVE_V4", CURL_IPRESOLVE_V4);
+	DCL_CONST(long, "IPRESOLVE_V6", CURL_IPRESOLVE_V6);
+	DCL_CONST(long, "IPRESOLVE_ANY", CURL_IPRESOLVE_WHATEVER);
+
+	/*
+	* Auth Constants
+	*/
 	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_GSSNEG", CURLAUTH_GSSNEGOTIATE);
 	DCL_CONST(long, "AUTH_ANY", CURLAUTH_ANY);
-#	endif /* LIBCURL_VERSION_NUM */
+	
+	/*
+	* Proxy Type Constants
+	*/
+#	if HTTP_CURL_VERSION(7,15,2)
+	DCL_CONST(long, "PROXY_SOCKS4", CURLPROXY_SOCKS4);
+#	endif
+	DCL_CONST(long, "PROXY_SOCKS5", CURLPROXY_SOCKS5);
+	DCL_CONST(long, "PROXY_HTTP", CURLPROXY_HTTP);
 #endif /* WONKY */
+	
+	return SUCCESS;
+}
+
+zend_object_value _http_request_object_new(zend_class_entry *ce TSRMLS_DC)
+{
+	return http_request_object_new_ex(ce, NULL, 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->request = http_request_init_ex(NULL, ch, 0, NULL);
+	
+	if (ptr) {
+		*ptr = o;
+	}
+
+	ALLOC_HASHTABLE(OBJ_PROP(o));
+	zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0);
+	zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+
+	ov.handle = putObject(http_request_object, o);
+	ov.handlers = &http_request_object_handlers;
+
+	return ov;
+}
+
+zend_object_value _http_request_object_clone_obj(zval *this_ptr TSRMLS_DC)
+{
+	zend_object_value new_ov;
+	http_request_object *new_obj;
+	getObject(http_request_object, old_obj);
+	
+	new_ov = http_request_object_new_ex(old_obj->zo.ce, NULL, &new_obj);
+	if (old_obj->request->ch) {
+		http_curl_init_ex(curl_easy_duphandle(old_obj->request->ch), new_obj->request);
+	}
+	
+	zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC);
+	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;
 }
 
 void _http_request_object_free(zend_object *object TSRMLS_DC)
 {
 	http_request_object *o = (http_request_object *) object;
 
-	if (OBJ_PROP(o)) {
-		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);
-	phpstr_dtor(&o->history);
-	efree(o);
+	http_request_free(&o->request);
+	freeObject(o);
 }
 
-STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ptr, http_request_body *body TSRMLS_DC)
+#define http_request_object_check_request_content_type(t) _http_request_object_check_request_content_type((t) TSRMLS_CC)
+static inline void _http_request_object_check_request_content_type(zval *this_ptr TSRMLS_DC)
 {
-	zval *meth, *URL;
-	char *request_uri;
-	STATUS status = SUCCESS;
-
-	if (!body) {
-		return FAILURE;
+	zval *ctype = GET_PROP(contentType);
+				
+	if (Z_STRLEN_P(ctype)) {
+		zval **headers, *opts = GET_PROP(options);
+		
+		if (	(Z_TYPE_P(opts) == IS_ARRAY) &&
+				(SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void *) &headers)) && 
+				(Z_TYPE_PP(headers) == IS_ARRAY)) {
+			zval **ct_header;
+			
+			/* only override if not already set */
+			if ((SUCCESS != zend_hash_find(Z_ARRVAL_PP(headers), "Content-Type", sizeof("Content-Type"), (void *) &ct_header))) {
+				add_assoc_stringl(*headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1);
+			} else
+			/* or not a string, zero length string or a string of spaces */
+			if ((Z_TYPE_PP(ct_header) != IS_STRING) || !Z_STRLEN_PP(ct_header)) {
+				add_assoc_stringl(*headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1);
+			} else {
+				int i, only_space = 1;
+				
+				/* check for spaces only */
+				for (i = 0; i < Z_STRLEN_PP(ct_header); ++i) {
+					if (!HTTP_IS_CTYPE(space, Z_STRVAL_PP(ct_header)[i])) {
+						only_space = 0;
+						break;
+					}
+				}
+				if (only_space) {
+					add_assoc_stringl(*headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1);
+				}
+			}
+		} else {
+			zval *headers;
+		
+			MAKE_STD_ZVAL(headers);
+			array_init(headers);
+			add_assoc_stringl(headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1);
+			zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addheaders", NULL, headers);
+			zval_ptr_dtor(&headers);
+		}
 	}
-	HTTP_CHECK_CURL_INIT(obj->ch, curl_easy_init(), 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;
-	}
+STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ptr TSRMLS_DC)
+{
+	STATUS status = SUCCESS;
+
+	http_request_reset(obj->request);
+	HTTP_CHECK_CURL_INIT(obj->request->ch, http_curl_init(obj->request), return FAILURE);
+	
+	obj->request->url = http_absolute_url(Z_STRVAL_P(GET_PROP(url)));
 	
-	meth = convert_to_type_ex(IS_LONG, GET_PROP(obj, method));
-	switch (Z_LVAL_P(meth))
+	switch (obj->request->meth = Z_LVAL_P(GET_PROP(method)))
 	{
 		case HTTP_GET:
 		case HTTP_HEAD:
-			body->type = -1;
-			body = NULL;
-		break;
+			break;
 
 		case HTTP_PUT:
 		{
-			php_stream_statbuf ssb;
-			php_stream *stream = php_stream_open_wrapper(Z_STRVAL_P(GET_PROP(obj, putFile)), "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL);
+			zval *put_file = GET_PROP(putFile);
 			
-			if (stream && !php_stream_stat(stream, &ssb)) {
-				body->type = HTTP_REQUEST_BODY_UPLOADFILE;
-				body->data = stream;
-				body->size = ssb.sb.st_size;
+			http_request_object_check_request_content_type(getThis());
+			
+			if (Z_STRLEN_P(put_file)) {
+				php_stream_statbuf ssb;
+				php_stream *stream = php_stream_open_wrapper_ex(Z_STRVAL_P(put_file), "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT);
+				
+				if (stream && SUCCESS == php_stream_stat(stream, &ssb)) {
+					obj->request->body = http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_UPLOADFILE, stream, ssb.sb.st_size, 1);
+				} else {
+					status = FAILURE;
+				}
 			} else {
-				status = FAILURE;
+				zval *put_data = GET_PROP(putData);
+				obj->request->body = http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_CSTRING,
+					estrndup(Z_STRVAL_P(put_data), Z_STRLEN_P(put_data)), Z_STRLEN_P(put_data), 1);
 			}
+			break;
 		}
-		break;
 
 		case HTTP_POST:
 		default:
 		{
 			/* check for raw post data */
-			zval *raw_data = convert_to_type_ex(IS_STRING, GET_PROP(obj, rawPostData));
+			zval *raw_data = GET_PROP(rawPostData);
 			
 			if (Z_STRLEN_P(raw_data)) {
-				zval *ctype = convert_to_type_ex(IS_STRING, GET_PROP(obj, contentType));
+				http_request_object_check_request_content_type(getThis());
+				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);
+			} else {
+				zval *zfields = GET_PROP(postFields), *zfiles = GET_PROP(postFiles);
+				HashTable *fields;
+				HashTable *files;
 				
-				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)) {
-						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)) {
-							add_assoc_stringl(*headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1);
-						}
-					} else {
-						zval *headers;
-						
-						MAKE_STD_ZVAL(headers);
-						array_init(headers);
-						add_assoc_stringl(headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1);
-						add_assoc_zval(opts, "headers", headers);
+				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 ((fields && zend_hash_num_elements(fields)) || (files && zend_hash_num_elements(files))) {
+					if (!(obj->request->body = http_request_body_fill(obj->request->body, fields, files))) {
+						status = FAILURE;
 					}
 				}
-				
-				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)));
 			}
+			break;
 		}
-		break;
 	}
-	
+
 	if (status == SUCCESS) {
-		zval *qdata = convert_to_type_ex(IS_STRING, GET_PROP(obj, queryData));
+		zval *qdata = GET_PROP(queryData);
+		zval *options = GET_PROP(options);
 		
 		if (Z_STRLEN_P(qdata)) {
-			if (!strchr(request_uri, '?')) {
-				strlcat(request_uri, "?", HTTP_URI_MAXLEN);
+			if (!strchr(obj->request->url, '?')) {
+				strlcat(obj->request->url, "?", HTTP_URL_MAXLEN);
 			} else {
-				strlcat(request_uri, "&", HTTP_URI_MAXLEN);
+				strlcat(obj->request->url, "&", HTTP_URL_MAXLEN);
 			}
-			strlcat(request_uri, Z_STRVAL_P(qdata), HTTP_URI_MAXLEN);
+			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));
+		
+		/* check if there's a onProgress method and add it as progress callback if one isn't already set */
+		if (zend_hash_exists(&Z_OBJCE_P(getThis())->function_table, "onprogress", sizeof("onprogress"))) {
+			zval **entry, *pcb;
+			
+			if (	(Z_TYPE_P(options) != IS_ARRAY)
+				||	(SUCCESS != zend_hash_find(Z_ARRVAL_P(options), "onprogress", sizeof("onprogress"), (void *) &entry)
+				||	(!zval_is_true(*entry)))) {
+				MAKE_STD_ZVAL(pcb);
+				array_init(pcb);
+				ZVAL_ADDREF(getThis());
+				add_next_index_zval(pcb, getThis());
+				add_next_index_stringl(pcb, "onprogress", lenof("onprogress"), 1);
+				http_request_set_progress_callback(obj->request, pcb);
+				zval_ptr_dtor(&pcb);
+			}
+		}
 	}
-	efree(request_uri);
-
-	/* clean previous response */
-	phpstr_dtor(&obj->response);
-	/* clean previous request */
-	phpstr_dtor(&obj->request);
 
 	return status;
 }
 
 STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this_ptr TSRMLS_DC)
 {
+	STATUS ret;
+	zval *info;
 	http_message *msg;
-
-	phpstr_fix(&obj->request);
-	phpstr_fix(&obj->response);
 	
-	msg = http_message_parse(PHPSTR_VAL(&obj->response), PHPSTR_LEN(&obj->response));
+	/* always fetch info */
+	MAKE_STD_ZVAL(info);
+	array_init(info);
+	http_request_info(obj->request, Z_ARRVAL_P(info));
+	SET_PROP(responseInfo, info);
+	zval_ptr_dtor(&info);
 	
-	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));
-
-		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 *free_msg = request;
-
-			do {
-				char *message;
-				size_t msglen;
-
-				http_message_tostring(response, &message, &msglen);
-				phpstr_append(&obj->history, message, msglen);
-				efree(message);
-
-				http_message_tostring(request, &message, &msglen);
-				phpstr_append(&obj->history, message, msglen);
-				efree(message);
-
-			} while ((response = response->parent) && (request = request->parent));
-
-			http_message_free(&free_msg);
-			phpstr_fix(&obj->history);
-		}
-
-		UPD_PROP(obj, long, responseCode, msg->http.info.response.code);
-
-		MAKE_STD_ZVAL(headers)
-		array_init(headers);
+	/* parse response message */
+	phpstr_fix(&obj->request->conv.request);
+	phpstr_fix(&obj->request->conv.response);
+	
+	if ((msg = http_message_parse(PHPSTR_VAL(&obj->request->conv.response), PHPSTR_LEN(&obj->request->conv.response)))) {
+		zval *message;
 
-		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);
+		if (zval_is_true(GET_PROP(recordHistory))) {
+			zval *hist, *history = GET_PROP(history);
+			http_message *response = http_message_parse(PHPSTR_VAL(&obj->request->conv.response), PHPSTR_LEN(&obj->request->conv.response));
+			http_message *request = http_message_parse(PHPSTR_VAL(&obj->request->conv.request), PHPSTR_LEN(&obj->request->conv.request));
+			
+			MAKE_STD_ZVAL(hist);
+			ZVAL_OBJVAL(hist, http_message_object_new_ex(http_message_object_ce, http_message_interconnect(response, request), NULL), 0);
+			if (Z_TYPE_P(history) == IS_OBJECT) {
+				http_message_object_prepend(hist, history);
+			}
+			SET_PROP(history, hist);
+			zval_ptr_dtor(&hist);
+		}
 
-		add_assoc_zval(resp, "headers", headers);
-		add_assoc_stringl(resp, "body", body, body_len, 0);
+		UPD_PROP(long, responseCode, msg->http.info.response.code);
+		UPD_PROP(string, responseStatus, STR_PTR(msg->http.info.response.status));
 
 		MAKE_STD_ZVAL(message);
-		ZVAL_OBJVAL(message, http_message_object_from_msg(msg));
-		SET_PROP(obj, responseMessage, message);
+		ZVAL_OBJVAL(message, http_message_object_new_ex(http_message_object_ce, msg, NULL), 0);
+		SET_PROP(responseMessage, message);
 		zval_ptr_dtor(&message);
 
-		http_request_info(obj->ch, Z_ARRVAL_P(info));
-		SET_PROP(obj, responseInfo, info);
+		ret = SUCCESS;
+	} else {
+		/* update properties with empty values*/
+		zval *znull;
+		
+		MAKE_STD_ZVAL(znull);
+		ZVAL_NULL(znull);
+		SET_PROP(responseMessage, znull);
+		zval_ptr_dtor(&znull);
+		
+		UPD_PROP(long, responseCode, 0);
+		UPD_PROP(string, responseStatus, "");
+		
+		/* append request message to history */
+		if (zval_is_true(GET_PROP(recordHistory))) {
+			http_message *request;
+			
+			if ((request = http_message_parse(PHPSTR_VAL(&obj->request->conv.request), PHPSTR_LEN(&obj->request->conv.request)))) {
+				zval *hist, *history = GET_PROP(history);
+				
+				MAKE_STD_ZVAL(hist);
+				ZVAL_OBJVAL(hist, http_message_object_new_ex(http_message_object_ce, request, NULL), 0);
+				if (Z_TYPE_P(history) == IS_OBJECT) {
+					http_message_object_prepend(hist, history);
+				}
+				SET_PROP(history, hist);
+				zval_ptr_dtor(&hist);
+			}
+		}
+		
+		ret = FAILURE;
+	}
+	
+	if (!EG(exception) && zend_hash_exists(&Z_OBJCE_P(getThis())->function_table, "onfinish", sizeof("onfinish"))) {
+		zval *param;
+		
+		MAKE_STD_ZVAL(param);
+		ZVAL_BOOL(param, ret == SUCCESS);
+		with_error_handling(EH_NORMAL, NULL) {
+			zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "onfinish", NULL, param);
+		} end_error_handling();
+		zval_ptr_dtor(&param);
+	}
+	
+	return ret;
+}
 
-		return SUCCESS;
+static int apply_pretty_key(void *pDest, int num_args, va_list args, zend_hash_key *hash_key)
+{
+	if (hash_key->nKeyLength > 1) {
+		hash_key->h = zend_get_hash_value(pretty_key(hash_key->arKey, hash_key->nKeyLength - 1, 1, 0), hash_key->nKeyLength);
 	}
+	return ZEND_HASH_APPLY_KEEP;
 }
 
-#define http_request_object_set_options_subr(key, ow) \
-	_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)
+#define http_request_object_set_options_subr(key, ow, pk) \
+	_http_request_object_set_options_subr(INTERNAL_FUNCTION_PARAM_PASSTHRU, (key), sizeof(key), (ow), (pk))
+static inline void _http_request_object_set_options_subr(INTERNAL_FUNCTION_PARAMETERS, char *key, size_t len, int overwrite, int prettify_keys)
 {
-	zval *opts, **options, *new_options = NULL;
-	getObject(http_request_object, obj);
+	zval *old_opts, *new_opts, *opts = NULL, **entry = NULL;
 
-	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(options);
+	if (Z_TYPE_P(old_opts) == IS_ARRAY) {
+		array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL_P(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(Z_ARRVAL_P(opts), Z_ARRVAL_PP(entry));
 			} else {
-				array_merge(new_options, *options);
+				array_join(Z_ARRVAL_P(opts), Z_ARRVAL_PP(entry), 0, prettify_keys ? ARRAY_JOIN_PRETTIFY : 0);
 			}
 		}
-	} else if (new_options && zend_hash_num_elements(Z_ARRVAL_P(new_options))) {
-		ZVAL_ADDREF(new_options);
-		add_assoc_zval(opts, key, new_options);
+	} else if (opts) {
+		if (prettify_keys) {
+			zend_hash_apply_with_arguments(Z_ARRVAL_P(opts), apply_pretty_key, 0);
+		}
+		ZVAL_ADDREF(opts);
+		add_assoc_zval_ex(new_opts, key, len, opts);
 	}
+	SET_PROP(options, new_opts);
+	zval_ptr_dtor(&new_opts);
 
 	RETURN_TRUE;
 }
@@ -632,17 +781,16 @@ static inline void _http_request_get_options_subr(INTERNAL_FUNCTION_PARAMETERS,
 {
 	NO_ARGS;
 
-	IF_RETVAL_USED {
+	if (return_value_used) {
 		zval *opts, **options;
-		getObject(http_request_object, obj);
-
-		opts = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, options));
 
+		opts = GET_PROP(options);
 		array_init(return_value);
 
-		if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), key, len, (void **) &options)) {
+		if (	(Z_TYPE_P(opts) == IS_ARRAY) && 
+				(SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), key, len, (void *) &options))) {
 			convert_to_array(*options);
-			array_copy(*options, return_value);
+			array_copy(Z_ARRVAL_PP(options), Z_ARRVAL_P(return_value));
 		}
 	}
 }
@@ -655,7 +803,7 @@ static inline void _http_request_get_options_subr(INTERNAL_FUNCTION_PARAMETERS,
  * 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
+ * Additionally accepts an optional int parameter specifying the request method
  * to use and an associative array as optional third parameter which will be
  * passed to HttpRequest::setOptions(). 
  * 
@@ -667,21 +815,14 @@ PHP_METHOD(HttpRequest, __construct)
 	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, "|sla", &URL, &URL_len, &meth, &options)) {
-		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);
+			UPD_STRL(url, URL, URL_len);
 		}
 		if (meth > -1) {
-			UPD_PROP(obj, long, method, meth);
+			UPD_PROP(long, method, meth);
 		}
 		if (options) {
 			zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "setoptions", NULL, options);
@@ -691,102 +832,76 @@ PHP_METHOD(HttpRequest, __construct)
 }
 /* }}} */
 
-/* {{{ 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.
  * 
- * Accepts an array as optional parameters, wich values will overwrite the 
- * currently set request options.  If the parameter is empty or mitted,
- * the optoions of the HttpRequest object will be reset.
+ * Accepts an array as optional parameters, which values will overwrite the 
+ * currently set request options.  If the parameter is empty or omitted,
+ * the options of the HttpRequest object will be reset.
  * 
  * Returns TRUE on success, or FALSE on failure.
  */
 PHP_METHOD(HttpRequest, setOptions)
 {
-	char *key = NULL;
-	ulong idx = 0;
-	zval *opts = NULL, *old_opts, **opt;
-	getObject(http_request_object, obj);
+	HashKey key = initHashKey(0);
+	HashPosition pos;
+	zval *opts = NULL, *old_opts, *new_opts, *add_opts, **opt;
 
-	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(options, new_opts);
+		zval_ptr_dtor(&new_opts);
 		RETURN_TRUE;
 	}
 	
+	MAKE_STD_ZVAL(add_opts);
+	array_init(add_opts);
 	/* some options need extra attention -- thus cannot use array_merge() directly */
-	FOREACH_KEYVAL(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_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_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_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);
-				}
-				UPD_STRL(obj, url, Z_STRVAL_PP(opt), Z_STRLEN_PP(opt));
-				continue;
-			} else if (!strcmp(key, "method")) {
-				if (Z_TYPE_PP(opt) != IS_LONG) {
-					convert_to_long_ex(opt);
-				}
-				UPD_PROP(obj, long, method, Z_LVAL_PP(opt));
-				continue;
+	FOREACH_KEYVAL(pos, opts, key, opt) {
+		if (key.type == HASH_KEY_IS_STRING) {
+			if (!strcmp(key.str, "headers")) {
+				zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addheaders", NULL, *opt);
+			} else if (!strcmp(key.str, "cookies")) {
+				zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addcookies", NULL, *opt);
+			} else if (!strcmp(key.str, "ssl")) {
+				zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addssloptions", NULL, *opt);
+			} else if ((!strcasecmp(key.str, "url")) || (!strcasecmp(key.str, "uri"))) {
+				zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "seturl", NULL, *opt);
+			} else if (!strcmp(key.str, "method")) {
+				zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "setmethod", NULL, *opt);
+#if HTTP_CURL_VERSION(7,14,1)
+			} else if (!strcmp(key.str, "resetcookies")) {
+				getObject(http_request_object, obj);
+				http_request_reset_cookies(obj->request, 0);
+#endif
+			} else if (!strcmp(key.str, "enablecookies")) {
+				getObject(http_request_object, obj);
+				http_request_enable_cookies(obj->request);
+			} else if (!strcasecmp(key.str, "recordHistory")) {
+				UPD_PROP(bool, recordHistory, 1);
+			} else {
+				ZVAL_ADDREF(*opt);
+				add_assoc_zval_ex(add_opts, key.str, key.len, *opt);
 			}
-
-			ZVAL_ADDREF(*opt);
-			add_assoc_zval(old_opts, key, *opt);
-
-			/* reset */
-			key = NULL;
 		}
 	}
-	SET_PROP(obj, options, old_opts);
-
+	
+	old_opts = GET_PROP(options);
+	if (Z_TYPE_P(old_opts) == IS_ARRAY) {
+		array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL_P(new_opts));
+	}
+	array_join(Z_ARRVAL_P(add_opts), Z_ARRVAL_P(new_opts), 0, 0);
+	SET_PROP(options, new_opts);
+	zval_ptr_dtor(&new_opts);
+	zval_ptr_dtor(&add_opts);
+	
 	RETURN_TRUE;
 }
 /* }}} */
@@ -801,13 +916,8 @@ 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);
+	if (return_value_used) {
+		RETURN_PROP(options);
 	}
 }
 /* }}} */
@@ -823,7 +933,7 @@ PHP_METHOD(HttpRequest, getOptions)
  */
 PHP_METHOD(HttpRequest, setSslOptions)
 {
-	http_request_object_set_options_subr("ssl", 1);
+	http_request_object_set_options_subr("ssl", 1, 0);
 }
 /* }}} */
 
@@ -837,7 +947,7 @@ PHP_METHOD(HttpRequest, setSslOptions)
  */
 PHP_METHOD(HttpRequest, addSslOptions)
 {
-	http_request_object_set_options_subr("ssl", 0);
+	http_request_object_set_options_subr("ssl", 0, 0);
 }
 /* }}} */
 
@@ -857,14 +967,14 @@ PHP_METHOD(HttpRequest, getSslOptions)
  *
  * Add request header name/value pairs.
  * 
- * Expects an ssociative array as parameter containing additional header
+ * Expects an associative array as parameter containing additional header
  * name/value pairs.
  * 
  * Returns TRUE on success, or FALSE on failure.
  */
 PHP_METHOD(HttpRequest, addHeaders)
 {
-	http_request_object_set_options_subr("headers", 0);
+	http_request_object_set_options_subr("headers", 0, 1);
 }
 
 /* {{{ proto bool HttpRequest::setHeaders([array headers])
@@ -878,7 +988,7 @@ PHP_METHOD(HttpRequest, addHeaders)
  */
 PHP_METHOD(HttpRequest, setHeaders)
 {
-	http_request_object_set_options_subr("headers", 1);
+	http_request_object_set_options_subr("headers", 1, 1);
 }
 /* }}} */
 
@@ -905,7 +1015,7 @@ PHP_METHOD(HttpRequest, getHeaders)
  */
 PHP_METHOD(HttpRequest, setCookies)
 {
-	http_request_object_set_options_subr("cookies", 1);
+	http_request_object_set_options_subr("cookies", 1, 0);
 }
 /* }}} */
 
@@ -920,7 +1030,7 @@ PHP_METHOD(HttpRequest, setCookies)
  */
 PHP_METHOD(HttpRequest, addCookies)
 {
-	http_request_object_set_options_subr("cookies", 0);
+	http_request_object_set_options_subr("cookies", 0, 0);
 }
 /* }}} */
 
@@ -936,6 +1046,44 @@ PHP_METHOD(HttpRequest, getCookies)
 }
 /* }}} */
 
+/* {{{ proto bool HttpRequest::enableCookies()
+ *
+ * Enable automatic sending of received cookies.
+ * Note that cuutomly set cookies will be sent anyway.
+ */
+PHP_METHOD(HttpRequest, enableCookies)
+{
+	NO_ARGS {
+		getObject(http_request_object, obj);
+		RETURN_SUCCESS(http_request_enable_cookies(obj->request));
+	}
+	
+}
+/* }}} */
+
+/* {{{ proto bool HttpRequest::resetCookies([bool session_only = FALSE])
+ *
+ * Reset all automatically received/sent cookies.
+ * Note that customly set cookies are not affected.
+ *
+ * Accepts an optional bool parameter specifying
+ * whether only session cookies should be reset
+ * (needs libcurl >= v7.15.4, else libcurl >= v7.14.1).
+ *
+ * Returns TRUE on success, or FALSE on failure.
+ */
+PHP_METHOD(HttpRequest, resetCookies)
+{
+	zend_bool session_only = 0;
+	getObject(http_request_object, obj);
+	
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &session_only)) {
+		RETURN_FALSE;
+	}
+	RETURN_SUCCESS(http_request_reset_cookies(obj->request, session_only));
+}
+/* }}} */
+
 /* {{{ proto bool HttpRequest::setUrl(string url)
  *
  * Set the request URL.
@@ -948,13 +1096,12 @@ PHP_METHOD(HttpRequest, setUrl)
 {
 	char *URL = NULL;
 	int URL_len;
-	getObject(http_request_object, obj);
 
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &URL, &URL_len)) {
 		RETURN_FALSE;
 	}
 
-	UPD_STRL(obj, url, URL, URL_len);
+	UPD_STRL(url, URL, URL_len);
 	RETURN_TRUE;
 }
 /* }}} */
@@ -969,11 +1116,8 @@ PHP_METHOD(HttpRequest, getUrl)
 {
 	NO_ARGS;
 
-	IF_RETVAL_USED {
-		getObject(http_request_object, obj);
-		zval *URL = GET_PROP(obj, url);
-
-		RETURN_ZVAL(URL, 1, 0);
+	if (return_value_used) {
+		RETURN_PROP(url);
 	}
 }
 /* }}} */
@@ -983,20 +1127,19 @@ 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.
  */
 PHP_METHOD(HttpRequest, setMethod)
 {
 	long meth;
-	getObject(http_request_object, obj);
 
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &meth)) {
 		RETURN_FALSE;
 	}
 
-	UPD_PROP(obj, long, method, meth);
+	UPD_PROP(long, method, meth);
 	RETURN_TRUE;
 }
 /* }}} */
@@ -1011,11 +1154,8 @@ PHP_METHOD(HttpRequest, getMethod)
 {
 	NO_ARGS;
 
-	IF_RETVAL_USED {
-		getObject(http_request_object, obj);
-		zval *meth = GET_PROP(obj, method);
-		
-		RETURN_ZVAL(meth, 1, 0);
+	if (return_value_used) {
+		RETURN_PROP(method);
 	}
 }
 /* }}} */
@@ -1034,14 +1174,15 @@ PHP_METHOD(HttpRequest, setContentType)
 {
 	char *ctype;
 	int ct_len;
-	getObject(http_request_object, obj);
 
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &ctype, &ct_len)) {
 		RETURN_FALSE;
 	}
 
-	HTTP_CHECK_CONTENT_TYPE(ctype, RETURN_FALSE);
-	UPD_STRL(obj, contentType, ctype, ct_len);
+	if (ct_len) {
+		HTTP_CHECK_CONTENT_TYPE(ctype, RETURN_FALSE);
+	}
+	UPD_STRL(contentType, ctype, ct_len);
 	RETURN_TRUE;
 }
 /* }}} */
@@ -1056,11 +1197,8 @@ PHP_METHOD(HttpRequest, getContentType)
 {
 	NO_ARGS;
 
-	IF_RETVAL_USED {
-		getObject(http_request_object, obj);
-		zval *ctype = GET_PROP(obj, contentType);
-		
-		RETURN_ZVAL(ctype, 1, 0);
+	if (return_value_used) {
+		RETURN_PROP(contentType);
 	}
 }
 /* }}} */
@@ -1079,14 +1217,13 @@ PHP_METHOD(HttpRequest, getContentType)
 PHP_METHOD(HttpRequest, setQueryData)
 {
 	zval *qdata = NULL;
-	getObject(http_request_object, obj);
 
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z!", &qdata)) {
 		RETURN_FALSE;
 	}
 
 	if ((!qdata) || Z_TYPE_P(qdata) == IS_NULL) {
-		UPD_STRL(obj, queryData, "", 0);
+		UPD_STRL(queryData, "", 0);
 	} else if ((Z_TYPE_P(qdata) == IS_ARRAY) || (Z_TYPE_P(qdata) == IS_OBJECT)) {
 		char *query_data = NULL;
 		
@@ -1094,11 +1231,16 @@ PHP_METHOD(HttpRequest, setQueryData)
 			RETURN_FALSE;
 		}
 		
-		UPD_PROP(obj, string, queryData, query_data);
+		UPD_PROP(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));
+		UPD_STRL(queryData, Z_STRVAL_P(qdata), Z_STRLEN_P(qdata));
+		if (orig != qdata) {
+			zval_ptr_dtor(&qdata);
+		}
 	}
 	RETURN_TRUE;
 }
@@ -1114,11 +1256,8 @@ PHP_METHOD(HttpRequest, getQueryData)
 {
 	NO_ARGS;
 
-	IF_RETVAL_USED {
-		getObject(http_request_object, obj);
-		zval *qdata = convert_to_type_ex(IS_STRING, GET_PROP(obj, queryData));
-		
-		RETURN_ZVAL(qdata, 1, 0);
+	if (return_value_used) {
+		RETURN_PROP(queryData);
 	}
 }
 /* }}} */
@@ -1137,19 +1276,18 @@ PHP_METHOD(HttpRequest, addQueryData)
 	zval *qdata, *old_qdata;
 	char *query_data = NULL;
 	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(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;
 	}
 
-	UPD_STRL(obj, queryData, query_data, query_data_len);
+	UPD_STRL(queryData, query_data, query_data_len);
 	efree(query_data);
 
 	RETURN_TRUE;
@@ -1168,16 +1306,24 @@ PHP_METHOD(HttpRequest, addQueryData)
  */
 PHP_METHOD(HttpRequest, addPostFields)
 {
-	zval *post, *post_data;
-	getObject(http_request_object, obj);
+	zval *post_data, *old_post, *new_post;
 
-	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(postFields);
+		if (Z_TYPE_P(old_post) == IS_ARRAY) {
+			array_copy(Z_ARRVAL_P(old_post), Z_ARRVAL_P(new_post));
+		}
+		array_join(Z_ARRVAL_P(post_data), Z_ARRVAL_P(new_post), 0, 0);
+		SET_PROP(postFields, new_post);
+		zval_ptr_dtor(&new_post);
+	}
+	
 	RETURN_TRUE;
 }
 /* }}} */
@@ -1195,18 +1341,18 @@ PHP_METHOD(HttpRequest, addPostFields)
 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);
+		array_copy(Z_ARRVAL_P(post_data), Z_ARRVAL_P(post));
 	}
+	SET_PROP(postFields, post);
+	zval_ptr_dtor(&post);
 
 	RETURN_TRUE;
 }
@@ -1222,12 +1368,8 @@ PHP_METHOD(HttpRequest, getPostFields)
 {
 	NO_ARGS;
 
-	IF_RETVAL_USED {
-		getObject(http_request_object, obj);
-		zval *post_data = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, postFields));
-		
-		array_init(return_value);
-		array_copy(post_data, return_value);
+	if (return_value_used) {
+		RETURN_PROP(postFields);
 	}
 }
 /* }}} */
@@ -1248,7 +1390,6 @@ PHP_METHOD(HttpRequest, setRawPostData)
 {
 	char *raw_data = NULL;
 	int data_len = 0;
-	getObject(http_request_object, obj);
 	
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &raw_data, &data_len)) {
 		RETURN_FALSE;
@@ -1258,7 +1399,7 @@ PHP_METHOD(HttpRequest, setRawPostData)
 		raw_data = "";
 	}
 	
-	UPD_STRL(obj, rawPostData, raw_data, data_len);
+	UPD_STRL(rawPostData, raw_data, data_len);
 	RETURN_TRUE;
 }
 /* }}} */
@@ -1274,26 +1415,23 @@ PHP_METHOD(HttpRequest, setRawPostData)
  */
 PHP_METHOD(HttpRequest, addRawPostData)
 {
-	char *raw_data, *new_data;
+	char *raw_data;
 	int data_len;
-	getObject(http_request_object, obj);
 	
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &raw_data, &data_len)) {
 		RETURN_FALSE;
 	}
 	
 	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';
+		zval *data = GET_PROP(rawPostData);
 		
-		if (Z_STRLEN_P(zdata)) {
-			memcpy(new_data, Z_STRVAL_P(zdata), Z_STRLEN_P(zdata));
+		if (Z_STRLEN_P(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);
+		} else {
+			UPD_STRL(putData, raw_data, data_len);
 		}
-		
-		memcpy(new_data + Z_STRLEN_P(zdata), raw_data, data_len);
-		UPD_STRL(obj, rawPostData, new_data, Z_STRLEN_P(zdata) + data_len);
 	}
 	
 	RETURN_TRUE;
@@ -1310,23 +1448,20 @@ PHP_METHOD(HttpRequest, getRawPostData)
 {
 	NO_ARGS;
 	
-	IF_RETVAL_USED {
-		getObject(http_request_object, obj);
-		zval *raw_data = convert_to_type_ex(IS_STRING, GET_PROP(obj, rawPostData));
-		
-		RETURN_ZVAL(raw_data, 1, 0);
+	if (return_value_used) {
+		RETURN_PROP(rawPostData);
 	}
 }
 /* }}} */
 
 /* {{{ proto bool HttpRequest::addPostFile(string name, string file[, string content_type = "application/x-octetstream"])
  *
- * Add a file to the POST request, leaving prefiously set files unchanged.
+ * Add a file to the POST request, leaving previously set files unchanged.
  * Affects only POST and custom requests. Cannot be used with raw post data.
  * 
  * Expects a string parameter containing the form element name, and a string
  * paremeter containing the path to the file which should be uploaded.
- * Additionally accepts an optional string parameter which chould contain
+ * Additionally accepts an optional string parameter which should contain
  * the content type of the file.
  * 
  * Returns TRUE on success, or FALSE if the content type seems not to contain a 
@@ -1334,10 +1469,9 @@ 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);
 
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|s", &name, &name_len, &file, &file_len, &type, &type_len)) {
 		RETURN_FALSE;
@@ -1357,8 +1491,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(postFiles);
+	if (Z_TYPE_P(old_post) == IS_ARRAY) {
+		array_copy(Z_ARRVAL_P(old_post), Z_ARRVAL_P(new_post));
+	}
+	add_next_index_zval(new_post, entry);
+	SET_PROP(postFiles, new_post);
+	zval_ptr_dtor(&new_post);
 
 	RETURN_TRUE;
 }
@@ -1377,19 +1518,19 @@ PHP_METHOD(HttpRequest, addPostFile)
  */
 PHP_METHOD(HttpRequest, setPostFiles)
 {
-	zval *files, *pFiles;
-	getObject(http_request_object, obj);
+	zval *files = NULL, *post;
 
-	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(Z_ARRVAL_P(files), Z_ARRVAL_P(post));
 	}
+	SET_PROP(postFiles, post);
+	zval_ptr_dtor(&post);
 
 	RETURN_TRUE;
 }
@@ -1405,12 +1546,8 @@ PHP_METHOD(HttpRequest, getPostFiles)
 {
 	NO_ARGS;
 
-	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);
+	if (return_value_used) {
+		RETURN_PROP(postFiles);
 	}
 }
 /* }}} */
@@ -1428,13 +1565,12 @@ PHP_METHOD(HttpRequest, setPutFile)
 {
 	char *file = "";
 	int file_len = 0;
-	getObject(http_request_object, obj);
 
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &file, &file_len)) {
 		RETURN_FALSE;
 	}
 
-	UPD_STRL(obj, putFile, file, file_len);
+	UPD_STRL(putFile, file, file_len);
 	RETURN_TRUE;
 }
 /* }}} */
@@ -1449,11 +1585,88 @@ PHP_METHOD(HttpRequest, getPutFile)
 {
 	NO_ARGS;
 
-	IF_RETVAL_USED {
-		getObject(http_request_object, obj);
-		zval *putfile = convert_to_type_ex(IS_STRING, GET_PROP(obj, putFile));
+	if (return_value_used) {
+		RETURN_PROP(putFile);
+	}
+}
+/* }}} */
+
+/* {{{ proto bool HttpRequest::setPutData([string put_data])
+ *
+ * Set PUT data to send, overwriting previously set PUT data.
+ * Affects only PUT requests.
+ * Only either PUT data or PUT file can be used for each request.
+ * PUT data has higher precedence and will be used even if a PUT
+ * file is set.  
+ * 
+ * Accepts a string as parameter containing the data to upload.
+ * 
+ * Returns TRUE on success, or FALSE on failure.
+ */
+PHP_METHOD(HttpRequest, setPutData)
+{
+	char *put_data = NULL;
+	int data_len = 0;
+	
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &put_data, &data_len)) {
+		RETURN_FALSE;
+	}
+	
+	if (!put_data) {
+		put_data = "";
+	}
+	
+	UPD_STRL(putData, put_data, data_len);
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto bool HttpRequest::addPutData(string put_data)
+ *
+ * Add PUT data, leaving previously set PUT data unchanged.
+ * Affects only PUT requests.
+ * 
+ * Expects a string as parameter containing the data to concatenate.
+ * 
+ * Returns TRUE on success, or FALSE on failure.
+ */
+PHP_METHOD(HttpRequest, addPutData)
+{
+	char *put_data;
+	int data_len;
+	
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &put_data, &data_len)) {
+		RETURN_FALSE;
+	}
+	
+	if (data_len) {
+		zval *data = GET_PROP(putData);
 		
-		RETURN_ZVAL(putfile, 1, 0);
+		if (Z_STRLEN_P(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, put_data, data_len);
+		} else {
+			UPD_STRL(putData, put_data, data_len);
+		}
+	}
+	
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto string HttpRequest::getPutData()
+ *
+ * Get previously set PUT data.
+ * 
+ * Returns a string containing the currently set raw post data.
+ */
+PHP_METHOD(HttpRequest, getPutData)
+{
+	NO_ARGS;
+	
+	if (return_value_used) {
+		RETURN_PROP(putData);
 	}
 }
 /* }}} */
@@ -1463,7 +1676,7 @@ PHP_METHOD(HttpRequest, getPutFile)
  * Get all response data after the request has been sent.
  * 
  * Returns an associative array with the key "headers" containing an associative
- * array holding all response headers, as well as the ley "body" containing a
+ * array holding all response headers, as well as the key "body" containing a
  * string with the response body.  
  * 
  * If redirects were allowed and several responses were received, the data 
@@ -1473,12 +1686,24 @@ PHP_METHOD(HttpRequest, getResponseData)
 {
 	NO_ARGS;
 
-	IF_RETVAL_USED {
-		getObject(http_request_object, obj);
-		zval *data = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, responseData));
+	if (return_value_used) {
+		char *body;
+		size_t body_len;
+		zval *headers, *message = GET_PROP(responseMessage);
 		
-		array_init(return_value);
-		array_copy(data, return_value);
+		if (Z_TYPE_P(message) == IS_OBJECT) {
+			getObjectEx(http_message_object, msg, message);
+			
+			array_init(return_value);
+			
+			MAKE_STD_ZVAL(headers);
+			array_init(headers);
+			zend_hash_copy(Z_ARRVAL_P(headers), &msg->message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+			add_assoc_zval(return_value, "headers", headers);
+			
+			phpstr_data(PHPSTR(msg->message), &body, &body_len);
+			add_assoc_stringl(return_value, "body", body, body_len, 0);
+		}
 	}
 }
 /* }}} */
@@ -1491,139 +1716,126 @@ PHP_METHOD(HttpRequest, getResponseData)
  * If the parameter is empty or omitted all response headers will be returned.
  * 
  * Returns either a string with the value of the header matching name if requested, 
- * FALSE on failure, or an associative array containing all reponse headers.
+ * FALSE on failure, or an associative array containing all response headers.
  * 
  * If redirects were allowed and several responses were received, the data 
  * references the last received response.
  */
 PHP_METHOD(HttpRequest, getResponseHeader)
 {
-	IF_RETVAL_USED {
-		zval *data, **headers, **header;
+	if (return_value_used) {
+		zval *header;
 		char *header_name = NULL;
 		int header_len = 0;
-		getObject(http_request_object, obj);
-
-		if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &header_name, &header_len)) {
-			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);
-		} else {
-			RETURN_FALSE;
+		if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &header_name, &header_len)) {
+			zval *message = GET_PROP(responseMessage);
+			
+			if (Z_TYPE_P(message) == IS_OBJECT) {
+				getObjectEx(http_message_object, msg, message);
+				
+				if (header_len) {
+					if ((header = http_message_header_ex(msg->message, pretty_key(header_name, header_len, 1, 1), header_len + 1, 0))) {
+						RETURN_ZVAL(header, 1, 1);
+					}
+				} else {
+					array_init(return_value);
+					zend_hash_copy(Z_ARRVAL_P(return_value), &msg->message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+					return;
+				}
+			}
 		}
+		RETURN_FALSE;
 	}
 }
 /* }}} */
 
-/* {{{ proto array HttpRequest::getResponseCookie([string name])
+/* {{{ proto array HttpRequest::getResponseCookies([int flags[, array allowed_extras]])
  *
  * Get response cookie(s) after the request has been sent.
  * 
- * Accepts a string as optional parameter specifying the name of the cookie to read.
- * If the parameter is empty or omitted, an associative array with all received
- * cookies will be returned.
- * 
- * Returns either an associative array with the cookie's name, value and any
- * additional params of the cookie matching name if requested, FALSE on failure,
- * or an array containing all received cookies as arrays.
+ * Returns an array of stdClass objects like http_parse_cookie would return.
  * 
  * If redirects were allowed and several responses were received, the data 
  * references the last received response.
  */
-PHP_METHOD(HttpRequest, getResponseCookie)
+PHP_METHOD(HttpRequest, getResponseCookies)
 {
-	IF_RETVAL_USED {
-		zval *data, **headers;
-		char *cookie_name = NULL;
-		int cookie_len = 0;
-		getObject(http_request_object, obj);
-
-		if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &cookie_name, &cookie_len)) {
-			RETURN_FALSE;
-		}
-
-		array_init(return_value);
-
-		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)) {
-			ulong idx = 0;
-			char *key = NULL;
-			zval **header = NULL;
-
-			convert_to_array_ex(headers);
-			FOREACH_HASH_KEYVAL(Z_ARRVAL_PP(headers), key, idx, header) {
-				if (key && !strcasecmp(key, "Set-Cookie")) {
-					/* several cookies? */
-					if (Z_TYPE_PP(header) == IS_ARRAY) {
-						zval **cookie;
-
-						FOREACH_HASH_VAL(Z_ARRVAL_PP(header), cookie) {
-							zval *cookie_hash;
-							MAKE_STD_ZVAL(cookie_hash);
-							array_init(cookie_hash);
-
-							if (SUCCESS == http_parse_cookie(Z_STRVAL_PP(cookie), Z_ARRVAL_P(cookie_hash))) {
-								if (!cookie_len) {
-									add_next_index_zval(return_value, cookie_hash);
-								} else {
-									zval **name;
-
-									if (	(SUCCESS == zend_hash_find(Z_ARRVAL_P(cookie_hash), "name", sizeof("name"), (void **) &name)) &&
-											(!strcmp(Z_STRVAL_PP(name), cookie_name))) {
-										add_next_index_zval(return_value, cookie_hash);
-										return; /* <<< FOUND >>> */
-									} else {
-										zval_dtor(cookie_hash);
-										efree(cookie_hash);
-									}
-								}
-							} else {
-								zval_dtor(cookie_hash);
-								efree(cookie_hash);
-							}
-						}
-					} else {
-						zval *cookie_hash;
-						
-						MAKE_STD_ZVAL(cookie_hash);
-						array_init(cookie_hash);
-						convert_to_string_ex(header);
+	if (return_value_used) {
+		long flags = 0;
+		zval *allowed_extras_array = NULL;
+		
+		if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|la!", &flags, &allowed_extras_array)) {
+			int i = 0;
+			HashKey key = initHashKey(0);
+			char **allowed_extras = NULL;
+			zval **header = NULL, **entry = NULL, *message = GET_PROP(responseMessage);
+			HashPosition pos, pos1, pos2;
+			
+			if (Z_TYPE_P(message) == IS_OBJECT) {
+				getObjectEx(http_message_object, msg, message);
+				
+				array_init(return_value);
+				
+				if (allowed_extras_array) {
+					allowed_extras = ecalloc(zend_hash_num_elements(Z_ARRVAL_P(allowed_extras_array)) + 1, sizeof(char *));
+					FOREACH_VAL(pos, allowed_extras_array, entry) {
+						ZVAL_ADDREF(*entry);
+						convert_to_string_ex(entry);
+						allowed_extras[i++] = estrndup(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry));
+						zval_ptr_dtor(entry);
+					}
+				}
+				
+				FOREACH_HASH_KEYVAL(pos1, &msg->message->hdrs, key, header) {
+					if (key.type == HASH_KEY_IS_STRING && !strcasecmp(key.str, "Set-Cookie")) {
+						http_cookie_list list;
 						
-						if (SUCCESS == http_parse_cookie(Z_STRVAL_PP(header), Z_ARRVAL_P(cookie_hash))) {
-							if (!cookie_len) {
-								add_next_index_zval(return_value, cookie_hash);
-							} else {
-								zval **name;
-
-								if (	(SUCCESS == zend_hash_find(Z_ARRVAL_P(cookie_hash), "name", sizeof("name"), (void **) &name)) &&
-										(!strcmp(Z_STRVAL_PP(name), cookie_name))) {
-									add_next_index_zval(return_value, cookie_hash);
-								} else {
-									zval_dtor(cookie_hash);
-									efree(cookie_hash);
+						if (Z_TYPE_PP(header) == IS_ARRAY) {
+							zval **single_header;
+							
+							FOREACH_VAL(pos2, *header, single_header) {
+								ZVAL_ADDREF(*single_header);
+								convert_to_string_ex(single_header);
+								if (http_parse_cookie_ex(&list, Z_STRVAL_PP(single_header), flags, allowed_extras)) {
+									zval *cookie;
+									
+									MAKE_STD_ZVAL(cookie);
+									object_init(cookie);
+									http_cookie_list_tostruct(&list, cookie);
+									add_next_index_zval(return_value, cookie);
+									http_cookie_list_dtor(&list);
 								}
+								zval_ptr_dtor(single_header);
 							}
 						} else {
-							zval_dtor(cookie_hash);
-							efree(cookie_hash);
+							ZVAL_ADDREF(*header);
+							convert_to_string_ex(header);
+							if (http_parse_cookie_ex(&list, Z_STRVAL_PP(header), flags, allowed_extras)) {
+								zval *cookie;
+								
+								MAKE_STD_ZVAL(cookie);
+								object_init(cookie);
+								http_cookie_list_tostruct(&list, cookie);
+								add_next_index_zval(return_value, cookie);
+								http_cookie_list_dtor(&list);
+							}
+							zval_ptr_dtor(header);
 						}
 					}
-					break;
 				}
-				/* reset key */
-				key = NULL;
+				
+				if (allowed_extras) {
+					for (i = 0; allowed_extras[i]; ++i) {
+						efree(allowed_extras[i]);
+					}
+					efree(allowed_extras);
+				}
+				
+				return;
 			}
 		}
+		RETURN_FALSE;
 	}
 }
 /* }}} */
@@ -1641,14 +1853,12 @@ PHP_METHOD(HttpRequest, getResponseBody)
 {
 	NO_ARGS;
 
-	IF_RETVAL_USED {
-		zval **body;
-		getObject(http_request_object, obj);
-		zval *data = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, responseData));
+	if (return_value_used) {
+		zval *message = GET_PROP(responseMessage);
 		
-		if (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "body", sizeof("body"), (void **) &body)) {
-			convert_to_string_ex(body);
-			RETURN_ZVAL(*body, 1, 0);
+		if (Z_TYPE_P(message) == IS_OBJECT) {
+			getObjectEx(http_message_object, msg, message);
+			RETURN_PHPSTR_DUP(&msg->message->body);
 		} else {
 			RETURN_FALSE;
 		}
@@ -1669,11 +1879,24 @@ PHP_METHOD(HttpRequest, getResponseCode)
 {
 	NO_ARGS;
 
-	IF_RETVAL_USED {
-		getObject(http_request_object, obj);
-		zval *code = convert_to_type_ex(IS_LONG, GET_PROP(obj, responseCode));
-		
-		RETURN_ZVAL(code, 1, 0);
+	if (return_value_used) {
+		RETURN_PROP(responseCode);
+	}
+}
+/* }}} */
+
+/* {{{ proto string HttpRequest::getResponseStatus()
+ *
+ * Get the response status (i.e. the string after the response code) after the message has been sent.
+ *
+ * Returns a string containing the response status text.
+ */
+PHP_METHOD(HttpRequest, getResponseStatus)
+{
+	NO_ARGS;
+	
+	if (return_value_used) {
+		RETURN_PROP(responseStatus);
 	}
 }
 /* }}} */
@@ -1696,28 +1919,30 @@ PHP_METHOD(HttpRequest, getResponseCode)
  */
 PHP_METHOD(HttpRequest, getResponseInfo)
 {
-	IF_RETVAL_USED {
+	if (return_value_used) {
 		zval *info, **infop;
 		char *info_name = NULL;
 		int info_len = 0;
-		getObject(http_request_object, obj);
 
 		if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &info_name, &info_len)) {
 			RETURN_FALSE;
 		}
 
-		info = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, responseInfo));
+		info = GET_PROP(responseInfo);
+		
+		if (Z_TYPE_P(info) != IS_ARRAY) {
+			RETURN_FALSE;
+		}
 
 		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)) {
+			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, 0);
 			} else {
 				http_error_ex(HE_NOTICE, HTTP_E_INVALID_PARAM, "Could not find response info named %s", info_name);
 				RETURN_FALSE;
 			}
 		} else {
-			array_init(return_value);
-			array_copy(info, return_value);
+			RETURN_ZVAL(info, 1, 0);
 		}
 	}
 }
@@ -1731,25 +1956,22 @@ PHP_METHOD(HttpRequest, getResponseInfo)
  * 
  * If redirects were allowed and several responses were received, the data 
  * references the last received response.  Use HttpMessage::getParentMessage()
- * to access the data of previously received responses whithin this request
+ * to access the data of previously received responses within this request
  * cycle.
  * 
- * Throws HttpException.
+ * Throws HttpException, HttpRuntimeException.
  */
 PHP_METHOD(HttpRequest, getResponseMessage)
 {
-	NO_ARGS;
-
-	IF_RETVAL_USED {
+	NO_ARGS {
 		zval *message;
-		getObject(http_request_object, obj);
 
 		SET_EH_THROW_HTTP();
-		message = GET_PROP(obj, responseMessage);
+		message = GET_PROP(responseMessage);
 		if (Z_TYPE_P(message) == IS_OBJECT) {
-			RETVAL_OBJECT(message);
+			RETVAL_OBJECT(message, 1);
 		} else {
-			RETVAL_NULL();
+			http_error(HE_WARNING, HTTP_E_RUNTIME, "HttpRequest does not contain a response message");
 		}
 		SET_EH_NORMAL();
 	}
@@ -1764,32 +1986,75 @@ PHP_METHOD(HttpRequest, getResponseMessage)
  * 
  * If redirects were allowed and several responses were received, the data 
  * references the last received response.  Use HttpMessage::getParentMessage()
- * to access the data of previously sent requests whithin this request
+ * to access the data of previously sent requests within 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)
 {
 	NO_ARGS;
 
-	IF_RETVAL_USED {
+	if (return_value_used) {
 		http_message *msg;
 		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)))) {
+			RETVAL_OBJVAL(http_message_object_new_ex(http_message_object_ce, msg, NULL), 0);
 		}
 		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 (return_value_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 (return_value_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.
  * 
- * If you don't want to record history at all, set the instance variable
- * HttpRequest::$recoedHistory to FALSE. 
+ * If you want to record history, set the instance variable
+ * HttpRequest::$recordHistory to TRUE.
  * 
  * Returns an HttpMessage object representing the complete request/response
  * history.
@@ -1797,19 +2062,21 @@ 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.
+ * Throws HttpRuntimeException.
  */
 PHP_METHOD(HttpRequest, getHistory)
 {
 	NO_ARGS;
 
-	IF_RETVAL_USED {
-		http_message *msg;
-		getObject(http_request_object, obj);
-
+	if (return_value_used) {
+		zval *hist;
+		
 		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));
+		hist = GET_PROP(history);
+		if (Z_TYPE_P(hist) == IS_OBJECT) {
+			RETVAL_OBJECT(hist, 1);
+		} else {
+			http_error(HE_WARNING, HTTP_E_RUNTIME, "The history is empty");
 		}
 		SET_EH_NORMAL();
 	}
@@ -1823,8 +2090,12 @@ PHP_METHOD(HttpRequest, getHistory)
 PHP_METHOD(HttpRequest, clearHistory)
 {
 	NO_ARGS {
-		getObject(http_request_object, obj);
-		phpstr_dtor(&obj->history);
+		zval *hist;
+		
+		MAKE_STD_ZVAL(hist);
+		ZVAL_NULL(hist);
+		SET_PROP(history, hist);
+		zval_ptr_dtor(&hist);
 	}
 }
 /* }}} */
@@ -1835,13 +2106,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 +2133,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 +2147,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(responseMessage), 1);
+		}
 	}
-	http_request_body_dtor(&body);
 
 	SET_EH_NORMAL();
 }