X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_object.c;h=5987681a73d2dcbaa7bfbe39782dfe2d62a7eb7b;hp=1c99c8c215e90231fc8a5c17634db91bf7bc8e1b;hb=e47ee304be6758fbbfd238476f8a6bda9090fe12;hpb=e32f6fed32939bba9839c0e4f7cdaec02d8828dd

diff --git a/http_request_object.c b/http_request_object.c
index 1c99c8c..5987681 100644
--- a/http_request_object.c
+++ b/http_request_object.c
@@ -32,6 +32,7 @@
 #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_api.h"
 #include "php_http_url_api.h"
 #include "php_http_message_api.h"
@@ -292,7 +293,7 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
 	return status;
 }
 
-STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this_ptr, HashTable *info TSRMLS_DC)
+STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this_ptr TSRMLS_DC)
 {
 	http_message *msg;
 
@@ -301,7 +302,7 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this
 	if (msg = http_message_parse(PHPSTR_VAL(&obj->response), PHPSTR_LEN(&obj->response))) {
 		char *body;
 		size_t body_len;
-		zval *headers, *message = GET_PROP(obj, responseMessage), *resp = GET_PROP(obj, responseData);
+		zval *headers, *message, *resp = GET_PROP(obj, responseData), *info = GET_PROP(obj, responseInfo);
 
 		UPD_PROP(obj, long, responseCode, msg->info.response.code);
 
@@ -314,14 +315,15 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this
 		add_assoc_zval(resp, "headers", headers);
 		add_assoc_stringl(resp, "body", body, body_len, 0);
 
-		//zval_dtor(&message);
-		Z_TYPE_P(message)  = IS_OBJECT;
+		MAKE_STD_ZVAL(message);
+		message->type = IS_OBJECT;
+		message->is_ref = 1;
 		message->value.obj = http_message_object_from_msg(msg);
 		SET_PROP(obj, responseMessage, message);
+		zval_ptr_dtor(&message);
 
-		if (info) {
-			http_request_info(obj->ch, info);
-		}
+		http_request_info(obj->ch, Z_ARRVAL_P(info));
+		SET_PROP(obj, responseInfo, info);
 
 		return SUCCESS;
 	}