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

diff --git a/php_http_client.c b/php_http_client.c
index 1f4e09a..dc97290 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);
 }
 
@@ -613,13 +612,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 +669,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);