X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_client.c;h=1e89b38fc877e6c790b0a6de3de8331370d9b75e;hp=1f4e09a4dc4c10268894c6129564d17e740af87f;hb=9886ab46dbb299c9d6cfef9d8a0258d91b90a8e6;hpb=0b83632b2b0a03eeca090f993259ccd95ab646fb

diff --git a/php_http_client.c b/php_http_client.c
index 1f4e09a..1e89b38 100644
--- a/php_http_client.c
+++ b/php_http_client.c
@@ -199,13 +199,12 @@ PHP_HTTP_API php_http_client_t *php_http_client_copy(php_http_client_t *from, ph
 
 PHP_HTTP_API void php_http_client_dtor(php_http_client_t *h)
 {
+	php_http_client_reset(h);
+
 	if (h->ops->dtor) {
 		h->ops->dtor(h);
 	}
 
-	zend_llist_clean(&h->requests);
-	zend_llist_clean(&h->responses);
-
 	php_resource_factory_free(&h->rf);
 }
 
@@ -389,6 +388,7 @@ static STATUS handle_response(void *arg, php_http_client_t *client, php_http_cli
 	if ((msg = *response)) {
 		php_http_message_object_t *msg_obj;
 		zval *info, *zresponse, *zrequest;
+		HashTable *info_ht;
 
 		if (i_zend_is_true(zend_read_property(php_http_client_class_entry, &zclient, ZEND_STRL("recordHistory"), 0 TSRMLS_CC))) {
 			handle_history(&zclient, *request, *response TSRMLS_CC);
@@ -407,8 +407,9 @@ static STATUS handle_response(void *arg, php_http_client_t *client, php_http_cli
 		php_http_message_object_prepend(zresponse, zrequest, 1 TSRMLS_CC);
 
 		MAKE_STD_ZVAL(info);
-		array_init(info);
-		php_http_client_getopt(client, PHP_HTTP_CLIENT_OPT_TRANSFER_INFO, e->request, &Z_ARRVAL_P(info));
+		object_init(info);
+		info_ht = HASH_OF(info);
+		php_http_client_getopt(client, PHP_HTTP_CLIENT_OPT_TRANSFER_INFO, e->request, &info_ht);
 		zend_update_property(php_http_client_response_class_entry, zresponse, ZEND_STRL("transferInfo"), info TSRMLS_CC);
 		zval_ptr_dtor(&info);
 
@@ -529,7 +530,7 @@ static PHP_METHOD(HttpClient, __construct)
 					obj->client->responses.dtor = response_dtor;
 				}
 			} else {
-				php_http_error(HE_WARNING, PHP_HTTP_E_REQUEST_FACTORY, "Failed to locate \"%s\" client request handler", driver_str);
+				php_http_error(HE_WARNING, PHP_HTTP_E_CLIENT, "Failed to locate \"%s\" client request handler", driver_str);
 			}
 		}
 	} end_error_handling();
@@ -613,13 +614,13 @@ static PHP_METHOD(HttpClient, enqueue)
 			if (php_http_client_enqueued(obj->client, msg_obj->message, NULL)) {
 				php_http_error(HE_WARNING, PHP_HTTP_E_CLIENT, "Failed to enqueue request; request already in queue");
 			} else {
-				php_http_client_enqueue_t q = {
-					msg_obj->message,
-					combined_options(getThis(), request TSRMLS_CC),
-					msg_queue_dtor,
-					msg_obj,
-					{fci, fcc}
-				};
+				php_http_client_enqueue_t q;
+				q.request = msg_obj->message;
+				q.options = combined_options(getThis(), request TSRMLS_CC);
+				q.dtor = msg_queue_dtor;
+				q.opaque = msg_obj;
+				q.closure.fci = fci;
+				q.closure.fcc = fcc;
 
 				if (fci.size) {
 					Z_ADDREF_P(fci.function_name);
@@ -670,13 +671,13 @@ static PHP_METHOD(HttpClient, requeue)
 		if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|f", &request, php_http_client_request_class_entry, &fci, &fcc)) {
 			php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 			php_http_message_object_t *msg_obj = zend_object_store_get_object(request TSRMLS_CC);
-			php_http_client_enqueue_t q = {
-				msg_obj->message,
-				combined_options(getThis(), request TSRMLS_CC),
-				msg_queue_dtor,
-				msg_obj,
-				{fci, fcc}
-			};
+			php_http_client_enqueue_t q;
+			q.request = msg_obj->message;
+			q.options = combined_options(getThis(), request TSRMLS_CC);
+			q.dtor = msg_queue_dtor;
+			q.opaque = msg_obj;
+			q.closure.fci = fci;
+			q.closure.fcc = fcc;
 
 			if (fci.size) {
 				Z_ADDREF_P(fci.function_name);
@@ -748,8 +749,6 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_send, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpClient, send)
 {
-	RETVAL_FALSE;
-
 	with_error_handling(EH_THROW, php_http_exception_class_entry) {
 		if (SUCCESS == zend_parse_parameters_none()) {
 			with_error_handling(EH_THROW, php_http_exception_class_entry) {
@@ -770,11 +769,8 @@ static PHP_METHOD(HttpClient, once)
 	if (SUCCESS == zend_parse_parameters_none()) {
 		php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-		if (0 < php_http_client_once(obj->client)) {
-			RETURN_TRUE;
-		}
+		RETURN_BOOL(0 < php_http_client_once(obj->client));
 	}
-	RETURN_FALSE;
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_wait, 0, 0, 0)
@@ -793,7 +789,6 @@ static PHP_METHOD(HttpClient, wait)
 
 		RETURN_BOOL(SUCCESS == php_http_client_wait(obj->client, timeout > 0 ? &timeout_val : NULL));
 	}
-	RETURN_FALSE;
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_enablePipelining, 0, 0, 0)
@@ -954,11 +949,13 @@ static PHP_METHOD(HttpClient, getTransferInfo)
 
 	with_error_handling(EH_THROW, php_http_exception_class_entry) {
 		if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &request, php_http_client_request_class_entry)) {
+			HashTable *info;
 			php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 			php_http_message_object_t *req_obj = zend_object_store_get_object(request TSRMLS_CC);
 
-			array_init(return_value);
-			php_http_client_getopt(obj->client, PHP_HTTP_CLIENT_OPT_TRANSFER_INFO, req_obj->message, &Z_ARRVAL_P(return_value));
+			object_init(return_value);
+			info = HASH_OF(return_value);
+			php_http_client_getopt(obj->client, PHP_HTTP_CLIENT_OPT_TRANSFER_INFO, req_obj->message, &info);
 		}
 	} end_error_handling();
 }