X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_request_object.c;h=ad6e43202b1b421c88773427ad1dd2e06d89675d;hb=5aa958980652d72433ba8e9e500b8dfd123d56a1;hp=7706fd7ef1cd45df6c46532d464d707c41973a9a;hpb=1041b48ef546c1a99f9a94210c19bcab364673cd;p=m6w6%2Fext-http

diff --git a/http_request_object.c b/http_request_object.c
index 7706fd7..ad6e432 100644
--- a/http_request_object.c
+++ b/http_request_object.c
@@ -6,7 +6,7 @@
     | 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>            |
     +--------------------------------------------------------------------+
 */
 
@@ -32,14 +32,11 @@
 #include "php_http_request_pool_api.h"
 #include "php_http_url_api.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
 #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)
@@ -56,6 +53,10 @@ HTTP_BEGIN_ARGS(setSslOptions, 0, 0)
 	HTTP_ARG_VAL(ssl_options, 0)
 HTTP_END_ARGS;
 
+HTTP_BEGIN_ARGS(addSslOptions, 0, 0)
+	HTTP_ARG_VAL(ssl_optins, 0)
+HTTP_END_ARGS;
+
 HTTP_EMPTY_ARGS(getHeaders, 0);
 HTTP_BEGIN_ARGS(setHeaders, 0, 0)
 	HTTP_ARG_VAL(headers, 0)
@@ -214,15 +215,16 @@ 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 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)
@@ -300,7 +302,7 @@ PHP_MINIT_FUNCTION(http_request_object)
 
 zend_object_value _http_request_object_new(zend_class_entry *ce TSRMLS_DC)
 {
-	return http_request_object_new_ex(ce, curl_easy_init(), NULL);
+	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)
@@ -336,6 +338,7 @@ zend_object_value _http_request_object_clone_obj(zval *this_ptr TSRMLS_DC)
 	
 	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);
+	http_curl_init_ex(new_obj->request->ch, new_obj->request, new_obj->request->_error);
 	
 	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);
@@ -401,6 +404,11 @@ static inline void _http_request_object_declare_default_properties(TSRMLS_D)
 	/* WebDAV Access Control - RFC 3744 */
 	DCL_CONST(long, "METH_ACL", HTTP_ACL);
 
+	/* cURL HTTP protocol versions */
+	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);
+
 	/*
 	 * Auth Constants
 	 */
@@ -429,11 +437,11 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
 	STATUS status = SUCCESS;
 
 	http_request_reset(obj->request);
-	HTTP_CHECK_CURL_INIT(obj->request->ch, curl_easy_init(), return FAILURE);
+	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(obj, url)));
+	obj->request->url = http_absolute_url(Z_STRVAL_P(GET_PROP(url)));
 	
-	switch (obj->request->meth = Z_LVAL_P(GET_PROP(obj, method)))
+	switch (obj->request->meth = Z_LVAL_P(GET_PROP(method)))
 	{
 		case HTTP_GET:
 		case HTTP_HEAD:
@@ -442,10 +450,10 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
 		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);
+			php_stream *stream = php_stream_open_wrapper(Z_STRVAL_P(GET_PROP(putFile)), "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL);
 			
 			if (stream && !php_stream_stat(stream, &ssb)) {
-				http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_UPLOADFILE, stream, ssb.sb.st_size, 1);
+				obj->request->body = http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_UPLOADFILE, stream, ssb.sb.st_size, 1);
 			} else {
 				status = FAILURE;
 			}
@@ -456,15 +464,17 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
 		default:
 		{
 			/* check for raw post data */
-			zval *raw_data = GET_PROP(obj, rawPostData);
+			zval *raw_data = GET_PROP(rawPostData);
 			
 			if (Z_STRLEN_P(raw_data)) {
-				zval *ctype = GET_PROP(obj, contentType);
+				zval *ctype = GET_PROP(contentType);
 				
 				if (Z_STRLEN_P(ctype)) {
-					zval **headers, *opts = GET_PROP(obj, options);
+					zval **headers, *opts = GET_PROP(options);
 					
-					if ((SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void **) &headers)) && (Z_TYPE_PP(headers) == IS_ARRAY)) {
+					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 */
@@ -477,7 +487,8 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
 						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);
+						zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addheaders", NULL, headers);
+						zval_ptr_dtor(&headers);
 					}
 				}
 
@@ -485,15 +496,17 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
 					estrndup(Z_STRVAL_P(raw_data), Z_STRLEN_P(raw_data)), Z_STRLEN_P(raw_data), 1);
 				
 			} else {
-				zval *zfields = GET_PROP(obj, postFields), *zfiles = GET_PROP(obj, postFiles);
+				zval *zfields = GET_PROP(postFields), *zfiles = GET_PROP(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;
+				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;
+					}
 				}
 			}
 		}
@@ -501,8 +514,8 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
 	}
 
 	if (status == SUCCESS) {
-		zval *qdata = GET_PROP(obj, queryData);
-		zval *options = GET_PROP(obj, options);
+		zval *qdata = GET_PROP(queryData);
+		zval *options = GET_PROP(options);
 		
 		if (Z_STRLEN_P(qdata)) {
 			if (!strchr(obj->request->url, '?')) {
@@ -514,6 +527,23 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
 		}
 		
 		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);
+			}
+		}
 	}
 
 	return status;
@@ -535,7 +565,7 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this
 		size_t body_len;
 		zval *headers, *message, *resp, *info;
 
-		if (zval_is_true(GET_PROP(obj, recordHistory))) {
+		if (zval_is_true(GET_PROP(recordHistory))) {
 			/* we need to act like a zipper, as we'll receive
 			 * the requests and the responses in separate chains
 			 * for redirects
@@ -561,7 +591,7 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this
 			phpstr_fix(&obj->history);
 		}
 
-		UPD_PROP(obj, long, responseCode, msg->http.info.response.code);
+		UPD_PROP(long, responseCode, msg->http.info.response.code);
 
 		MAKE_STD_ZVAL(resp);
 		array_init(resp);
@@ -571,20 +601,24 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this
 		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);
+		SET_PROP(responseData, resp);
 		zval_ptr_dtor(&resp);
 
 		MAKE_STD_ZVAL(message);
 		ZVAL_OBJVAL(message, http_message_object_new_ex(http_message_object_ce, msg, NULL));
-		SET_PROP(obj, responseMessage, message);
+		SET_PROP(responseMessage, message);
 		zval_ptr_dtor(&message);
 
 		MAKE_STD_ZVAL(info);
 		array_init(info);
 		http_request_info(obj->request, Z_ARRVAL_P(info));
-		SET_PROP(obj, responseInfo, info);
+		SET_PROP(responseInfo, info);
 		zval_ptr_dtor(&info);
-
+		
+		if (zend_hash_exists(&Z_OBJCE_P(getThis())->function_table, "onfinish", sizeof("onfinish"))) {
+			zend_call_method_with_0_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "onfinish", NULL);
+		}
+		
 		return SUCCESS;
 	}
 }
@@ -602,7 +636,7 @@ static inline void _http_request_object_set_options_subr(INTERNAL_FUNCTION_PARAM
 
 	MAKE_STD_ZVAL(new_opts);
 	array_init(new_opts);
-	old_opts = GET_PROP(obj, options);
+	old_opts = GET_PROP(options);
 	if (Z_TYPE_P(old_opts) == IS_ARRAY) {
 		array_copy(old_opts, new_opts);
 	}
@@ -622,7 +656,7 @@ static inline void _http_request_object_set_options_subr(INTERNAL_FUNCTION_PARAM
 		ZVAL_ADDREF(opts);
 		add_assoc_zval(new_opts, key, opts);
 	}
-	SET_PROP(obj, options, new_opts);
+	SET_PROP(options, new_opts);
 	zval_ptr_dtor(&new_opts);
 
 	RETURN_TRUE;
@@ -638,11 +672,12 @@ static inline void _http_request_get_options_subr(INTERNAL_FUNCTION_PARAMETERS,
 		zval *opts, **options;
 		getObject(http_request_object, obj);
 
-		opts = 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);
 		}
@@ -674,10 +709,10 @@ PHP_METHOD(HttpRequest, __construct)
 	SET_EH_THROW_HTTP();
 	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);
@@ -687,18 +722,6 @@ PHP_METHOD(HttpRequest, __construct)
 }
 /* }}} */
 
-/* {{{ proto void HttpRequest::__destruct()
- *
- * Destroys the HttpRequest object.
- */
-PHP_METHOD(HttpRequest, __destruct)
-{
-	getObject(http_request_object, obj);
-
-	NO_ARGS;
-}
-/* }}} */
-
 /* {{{ proto bool HttpRequest::setOptions([array options])
  *
  * Set the request options to use.  See http_get() for a full list of available options.
@@ -714,7 +737,7 @@ PHP_METHOD(HttpRequest, setOptions)
 	char *key = NULL;
 	ulong idx = 0;
 	HashPosition pos;
-	zval *opts = NULL, *old_opts, *new_opts, **opt;
+	zval *opts = NULL, *old_opts, *new_opts, *add_opts, **opt;
 	getObject(http_request_object, obj);
 
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts)) {
@@ -725,62 +748,43 @@ PHP_METHOD(HttpRequest, setOptions)
 	array_init(new_opts);
 		
 	if (!opts || !zend_hash_num_elements(Z_ARRVAL_P(opts))) {
-		SET_PROP(obj, options, new_opts);
+		SET_PROP(options, new_opts);
+		zval_ptr_dtor(&new_opts);
 		RETURN_TRUE;
 	}
-
-	old_opts = GET_PROP(obj, options);
-	if (Z_TYPE_P(old_opts) == IS_ARRAY) {
-		array_copy(old_opts, new_opts);
-	}
 	
+	MAKE_STD_ZVAL(add_opts);
+	array_init(add_opts);
 	/* some options need extra attention -- thus cannot use array_merge() directly */
 	FOREACH_KEYVAL(pos, opts, key, idx, opt) {
 		if (key) {
 			if (!strcmp(key, "headers")) {
-				zval **headers;
-				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;
-				}
+				zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addheaders", NULL, *opt);
 			} else if (!strcmp(key, "cookies")) {
-				zval **cookies;
-				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;
-				}
+				zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addcookies", NULL, *opt);
 			} else if (!strcmp(key, "ssl")) {
-				zval **ssl;
-				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 ((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;
+				zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addssloptions", NULL, *opt);
+			} else if ((!strcasecmp(key, "url")) || (!strcasecmp(key, "uri"))) {
+				zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "seturl", NULL, *opt);
 			} 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;
+				zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "setmethod", NULL, *opt);
+			} else {
+				ZVAL_ADDREF(*opt);
+				add_assoc_zval(add_opts, key, *opt);
 			}
-			
-			ZVAL_ADDREF(*opt);
-			add_assoc_zval(new_opts, key, *opt);
-
 			/* reset */
 			key = NULL;
 		}
 	}
-	SET_PROP(obj, options, new_opts);
+	
+	old_opts = GET_PROP(options);
+	if (Z_TYPE_P(old_opts) == IS_ARRAY) {
+		array_copy(old_opts, new_opts);
+	}
+	array_merge(add_opts, new_opts);
+	SET_PROP(options, new_opts);
 	zval_ptr_dtor(&new_opts);
+	zval_ptr_dtor(&add_opts);
 	
 	RETURN_TRUE;
 }
@@ -797,10 +801,7 @@ PHP_METHOD(HttpRequest, getOptions)
 	NO_ARGS;
 
 	IF_RETVAL_USED {
-		getObject(http_request_object, obj);
-		zval *options = GET_PROP(obj, options);
-		
-		RETURN_ZVAL(options, 1, 0);
+		RETURN_PROP(options);
 	}
 }
 /* }}} */
@@ -947,7 +948,7 @@ PHP_METHOD(HttpRequest, setUrl)
 		RETURN_FALSE;
 	}
 
-	UPD_STRL(obj, url, URL, URL_len);
+	UPD_STRL(url, URL, URL_len);
 	RETURN_TRUE;
 }
 /* }}} */
@@ -963,10 +964,7 @@ 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);
+		RETURN_PROP(url);
 	}
 }
 /* }}} */
@@ -989,7 +987,7 @@ PHP_METHOD(HttpRequest, setMethod)
 		RETURN_FALSE;
 	}
 
-	UPD_PROP(obj, long, method, meth);
+	UPD_PROP(long, method, meth);
 	RETURN_TRUE;
 }
 /* }}} */
@@ -1005,10 +1003,7 @@ PHP_METHOD(HttpRequest, getMethod)
 	NO_ARGS;
 
 	IF_RETVAL_USED {
-		getObject(http_request_object, obj);
-		zval *method = GET_PROP(obj, method);
-		
-		RETURN_ZVAL(method, 1, 0);
+		RETURN_PROP(method);
 	}
 }
 /* }}} */
@@ -1034,7 +1029,7 @@ PHP_METHOD(HttpRequest, setContentType)
 	}
 
 	HTTP_CHECK_CONTENT_TYPE(ctype, RETURN_FALSE);
-	UPD_STRL(obj, contentType, ctype, ct_len);
+	UPD_STRL(contentType, ctype, ct_len);
 	RETURN_TRUE;
 }
 /* }}} */
@@ -1050,10 +1045,7 @@ 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);
+		RETURN_PROP(contentType);
 	}
 }
 /* }}} */
@@ -1079,7 +1071,7 @@ PHP_METHOD(HttpRequest, setQueryData)
 	}
 
 	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;
 		
@@ -1087,13 +1079,13 @@ 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);
 		}
@@ -1113,10 +1105,7 @@ PHP_METHOD(HttpRequest, getQueryData)
 	NO_ARGS;
 
 	IF_RETVAL_USED {
-		getObject(http_request_object, obj);
-		zval *qdata = GET_PROP(obj, queryData);
-		
-		RETURN_ZVAL(qdata, 1, 0);
+		RETURN_PROP(queryData);
 	}
 }
 /* }}} */
@@ -1141,13 +1130,13 @@ PHP_METHOD(HttpRequest, addQueryData)
 		RETURN_FALSE;
 	}
 
-	old_qdata = 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;
@@ -1176,12 +1165,12 @@ PHP_METHOD(HttpRequest, addPostFields)
 	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);
+		old_post = GET_PROP(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);
+		SET_PROP(postFields, new_post);
 		zval_ptr_dtor(&new_post);
 	}
 	
@@ -1204,16 +1193,16 @@ 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;
 	}
 
 	MAKE_STD_ZVAL(post);
 	array_init(post);
-	if (post_data && (Z_TYPE_P(post_data) == IS_ARRAY)) {
+	if (post_data && zend_hash_num_elements(Z_ARRVAL_P(post_data))) {
 		array_copy(post_data, post);
 	}
-	SET_PROP(obj, postFields, post);
+	SET_PROP(postFields, post);
 	zval_ptr_dtor(&post);
 
 	RETURN_TRUE;
@@ -1231,10 +1220,7 @@ PHP_METHOD(HttpRequest, getPostFields)
 	NO_ARGS;
 
 	IF_RETVAL_USED {
-		getObject(http_request_object, obj);
-		zval *post = GET_PROP(obj, postFields);
-		
-		RETURN_ZVAL(post, 1, 0);
+		RETURN_PROP(postFields);
 	}
 }
 /* }}} */
@@ -1265,7 +1251,7 @@ PHP_METHOD(HttpRequest, setRawPostData)
 		raw_data = "";
 	}
 	
-	UPD_STRL(obj, rawPostData, raw_data, data_len);
+	UPD_STRL(rawPostData, raw_data, data_len);
 	RETURN_TRUE;
 }
 /* }}} */
@@ -1290,13 +1276,13 @@ PHP_METHOD(HttpRequest, addRawPostData)
 	}
 	
 	if (data_len) {
-		zval *zdata = GET_PROP(obj, rawPostData);
+		zval *data = zval_copy(IS_STRING, GET_PROP(rawPostData));
 		
-		SEPARATE_ZVAL(&zdata);
-		Z_STRVAL_P(zdata) = erealloc(Z_STRVAL_P(zdata), (Z_STRLEN_P(zdata) += data_len) + 1);
-		Z_STRVAL_P(zdata)[Z_STRLEN_P(zdata)] = '\0';
-		memcpy(Z_STRVAL_P(zdata) + Z_STRLEN_P(zdata) - data_len, raw_data, data_len);
-		SET_PROP(obj, rawPostData, zdata);
+		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(rawPostData, data);
+		zval_free(&data);
 	}
 	
 	RETURN_TRUE;
@@ -1314,10 +1300,7 @@ PHP_METHOD(HttpRequest, getRawPostData)
 	NO_ARGS;
 	
 	IF_RETVAL_USED {
-		getObject(http_request_object, obj);
-		zval *post = GET_PROP(obj, rawPostData);
-		
-		RETURN_ZVAL(post, 1, 0);
+		RETURN_PROP(rawPostData);
 	}
 }
 /* }}} */
@@ -1362,12 +1345,13 @@ PHP_METHOD(HttpRequest, addPostFile)
 
 	MAKE_STD_ZVAL(new_post);
 	array_init(new_post);
-	old_post = GET_PROP(obj, postFiles);
+	old_post = GET_PROP(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);
+	SET_PROP(postFiles, new_post);
+	zval_ptr_dtor(&new_post);
 
 	RETURN_TRUE;
 }
@@ -1386,26 +1370,20 @@ PHP_METHOD(HttpRequest, addPostFile)
  */
 PHP_METHOD(HttpRequest, setPostFiles)
 {
-	zval *files, *post;
+	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;
 	}
 
-	post = GET_PROP(obj, postFiles);
-	if (Z_TYPE_P(post) == IS_NULL) {
-		MAKE_STD_ZVAL(post);
-		array_init(post);
-	} else {
-		SEPARATE_ZVAL(&post);
-	}
-	
-	zend_hash_clean(Z_ARRVAL_P(post));
-	if (files && zend_hash_num_elements(Z_ARRVAL_P(files))) {
+	MAKE_STD_ZVAL(post);
+	array_init(post);
+	if (files && (Z_TYPE_P(files) == IS_ARRAY)) {
 		array_copy(files, post);
 	}
-	SET_PROP(obj, postFiles, post);
+	SET_PROP(postFiles, post);
+	zval_ptr_dtor(&post);
 
 	RETURN_TRUE;
 }
@@ -1422,10 +1400,7 @@ PHP_METHOD(HttpRequest, getPostFiles)
 	NO_ARGS;
 
 	IF_RETVAL_USED {
-		getObject(http_request_object, obj);
-
-		array_init(return_value);
-		array_copy(GET_PROP(obj, postFiles), return_value);
+		RETURN_PROP(postFiles);
 	}
 }
 /* }}} */
@@ -1449,7 +1424,7 @@ PHP_METHOD(HttpRequest, setPutFile)
 		RETURN_FALSE;
 	}
 
-	UPD_STRL(obj, putFile, file, file_len);
+	UPD_STRL(putFile, file, file_len);
 	RETURN_TRUE;
 }
 /* }}} */
@@ -1465,10 +1440,7 @@ PHP_METHOD(HttpRequest, getPutFile)
 	NO_ARGS;
 
 	IF_RETVAL_USED {
-		getObject(http_request_object, obj);
-		zval *file = GET_PROP(obj, putFile);
-		
-		RETVAL_ZVAL(file, 1, 0);
+		RETURN_PROP(putFile);
 	}
 }
 /* }}} */
@@ -1489,10 +1461,7 @@ PHP_METHOD(HttpRequest, getResponseData)
 	NO_ARGS;
 
 	IF_RETVAL_USED {
-		getObject(http_request_object, obj);
-		
-		array_init(return_value);
-		array_copy(GET_PROP(obj, responseData), return_value);
+		RETURN_PROP(responseData);
 	}
 }
 /* }}} */
@@ -1522,9 +1491,10 @@ PHP_METHOD(HttpRequest, getResponseHeader)
 			RETURN_FALSE;
 		}
 
-		data = GET_PROP(obj, responseData);
-		if (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) {
-			convert_to_array(*headers);
+		data = GET_PROP(responseData);
+		if (	(Z_TYPE_P(data) == IS_ARRAY) && 
+				(SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) &&
+				(Z_TYPE_PP(headers) == IS_ARRAY)) {
 			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)) {
@@ -1568,8 +1538,10 @@ PHP_METHOD(HttpRequest, getResponseCookie)
 
 		array_init(return_value);
 
-		data = GET_PROP(obj, responseData);
-		if (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) {
+		data = GET_PROP(responseData);
+		if (	(Z_TYPE_P(data) == IS_ARRAY) &&
+				(SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) &&
+				(Z_TYPE_PP(headers) == IS_ARRAY)) {
 			ulong idx = 0;
 			char *key = NULL;
 			zval **header = NULL;
@@ -1660,9 +1632,10 @@ PHP_METHOD(HttpRequest, getResponseBody)
 	IF_RETVAL_USED {
 		zval **body;
 		getObject(http_request_object, obj);
-		zval *data = GET_PROP(obj, responseData);
+		zval *data = GET_PROP(responseData);
 		
-		if (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "body", sizeof("body"), (void **) &body)) {
+		if (	(Z_TYPE_P(data) == IS_ARRAY) && 
+				(SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "body", sizeof("body"), (void **) &body))) {
 			RETURN_ZVAL(*body, 1, 0);
 		} else {
 			RETURN_FALSE;
@@ -1685,10 +1658,7 @@ PHP_METHOD(HttpRequest, getResponseCode)
 	NO_ARGS;
 
 	IF_RETVAL_USED {
-		getObject(http_request_object, obj);
-		zval *code = GET_PROP(obj, responseCode);
-		
-		RETVAL_ZVAL(code, 1, 0);
+		RETURN_PROP(responseCode);
 	}
 }
 /* }}} */
@@ -1721,7 +1691,11 @@ PHP_METHOD(HttpRequest, getResponseInfo)
 			RETURN_FALSE;
 		}
 
-		info = 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)) {
@@ -1759,7 +1733,7 @@ PHP_METHOD(HttpRequest, getResponseMessage)
 		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);
 		} else {
@@ -1952,7 +1926,7 @@ PHP_METHOD(HttpRequest, send)
 	} 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));
+			RETVAL_OBJECT(GET_PROP(responseMessage));
 		}
 	}