X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_http_client.c;h=4fdbfe8c93f5f15140c6771db5c9b8ac7a40a804;hb=refs%2Fheads%2Fv3.x;hp=2f8b4aed62df35b79016a276930f21c4666b27b0;hpb=d5d03014cff8c8ca80ee7866af100d3ceae1bd8f;p=m6w6%2Fext-http

diff --git a/src/php_http_client.c b/src/php_http_client.c
index 2f8b4ae..4fdbfe8 100644
--- a/src/php_http_client.c
+++ b/src/php_http_client.c
@@ -254,6 +254,20 @@ ZEND_RESULT_CODE php_http_client_dequeue(php_http_client_t *h, php_http_message_
 	return FAILURE;
 }
 
+ZEND_RESULT_CODE php_http_client_requeue(php_http_client_t *h, php_http_message_t *request)
+{
+	if (h->ops->dequeue) {
+		php_http_client_enqueue_t *enqueue = php_http_client_enqueued(h, request, NULL);
+
+		if (!enqueue) {
+			php_error_docref(NULL, E_WARNING, "Failed to requeue request; request not in queue");
+			return FAILURE;
+		}
+		return h->ops->requeue(h, enqueue);
+	}
+	return FAILURE;
+}
+
 php_http_client_enqueue_t *php_http_client_enqueued(php_http_client_t *h, void *compare_arg, php_http_client_enqueue_cmp_func_t compare_func)
 {
 	zend_llist_element *el = NULL;
@@ -401,8 +415,9 @@ static HashTable *php_http_client_object_get_gc(zval *object, zval **table, int
 
 	for (el = obj->client->requests.head; el; el = el->next) {
 		php_http_client_enqueue_t *q = (php_http_client_enqueue_t *) el->data;
-		php_http_message_object_t *request_obj = q->opaque; /* FIXME */
-		ZVAL_OBJ(&obj->gc[(*n)++], &request_obj->zo);
+		if (q->request_obj) {
+			ZVAL_OBJ(&obj->gc[(*n)++], &q->request_obj->zo);
+		}
 	}
 
 	ZEND_HASH_FOREACH_VAL(props, val)
@@ -583,7 +598,7 @@ static PHP_METHOD(HttpClient, __construct)
 		php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|S!S!", &driver_name, &persistent_handle_name), invalid_arg, return);
 
 		if (!zend_hash_num_elements(&php_http_client_drivers)) {
-			php_http_throw(unexpected_val, "No http\\Client drivers available", NULL);
+			php_http_throw(unexpected_val, "No http\\Client drivers available");
 			return;
 		}
 		if (!(driver = php_http_client_driver_get(driver_name))) {
@@ -632,9 +647,8 @@ static PHP_METHOD(HttpClient, reset)
 	RETVAL_ZVAL(getThis(), 1, 0);
 }
 
-static HashTable *combined_options(zval *client, zval *request)
+static HashTable *combined_options(HashTable *options, zval *client, zval *request)
 {
-	HashTable *options;
 	unsigned num_options = 0;
 	zval z_roptions, z_options_tmp, *z_coptions = zend_read_property(php_http_client_class_entry, client, ZEND_STRL("options"), 0, &z_options_tmp);
 
@@ -649,8 +663,12 @@ static HashTable *combined_options(zval *client, zval *request)
 			num_options = num;
 		}
 	}
-	ALLOC_HASHTABLE(options);
-	ZEND_INIT_SYMTABLE_EX(options, num_options, 0);
+	if (options) {
+		zend_hash_clean(options);
+	} else {
+		ALLOC_HASHTABLE(options);
+		ZEND_INIT_SYMTABLE_EX(options, num_options, 0);
+	}
 	if (Z_TYPE_P(z_coptions) == IS_ARRAY) {
 		array_copy(Z_ARRVAL_P(z_coptions), options);
 	}
@@ -697,7 +715,7 @@ static PHP_METHOD(HttpClient, enqueue)
 	msg_obj = PHP_HTTP_OBJ(NULL, request);
 
 	if (php_http_client_enqueued(obj->client, msg_obj->message, NULL)) {
-		php_http_throw(bad_method_call, "Failed to enqueue request; request already in queue", NULL);
+		php_http_throw(bad_method_call, "Failed to enqueue request; request already in queue");
 		return;
 	}
 
@@ -713,7 +731,7 @@ static PHP_METHOD(HttpClient, enqueue)
 
 	Z_ADDREF_P(request);
 	q.request = msg_obj->message;
-	q.options = combined_options(getThis(), request);
+	q.options = combined_options(NULL, getThis(), request);
 	q.dtor = msg_queue_dtor;
 	q.opaque = msg_obj;
 	q.closure.fci = fci;
@@ -749,7 +767,7 @@ static PHP_METHOD(HttpClient, dequeue)
 	msg_obj = PHP_HTTP_OBJ(NULL, request);
 
 	if (!php_http_client_enqueued(obj->client, msg_obj->message, NULL)) {
-		php_http_throw(bad_method_call, "Failed to dequeue request; request not in queue", NULL);
+		php_http_throw(bad_method_call, "Failed to dequeue request; request not in queue");
 		return;
 	}
 
@@ -769,19 +787,35 @@ static PHP_METHOD(HttpClient, requeue)
 	zend_fcall_info_cache fcc = empty_fcall_info_cache;
 	php_http_client_object_t *obj;
 	php_http_message_object_t *msg_obj;
-	php_http_client_enqueue_t q;
+	php_http_client_enqueue_t q, *e;
 
 	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "O|f", &request, php_http_get_client_request_class_entry(), &fci, &fcc), invalid_arg, return);
 
 	obj = PHP_HTTP_OBJ(NULL, getThis());
 	msg_obj = PHP_HTTP_OBJ(NULL, request);
 
-	if (php_http_client_enqueued(obj->client, msg_obj->message, NULL)) {
-		php_http_expect(SUCCESS == php_http_client_dequeue(obj->client, msg_obj->message), runtime, return);
+	if ((e = php_http_client_enqueued(obj->client, msg_obj->message, NULL))) {
+		combined_options(e->options, getThis(), request);
+		php_http_expect(SUCCESS == php_http_client_requeue(obj->client, msg_obj->message), runtime, return);
+		if (fci.size) {
+			if (e->closure.fci.size) {
+				zval_ptr_dtor(&e->closure.fci.function_name);
+				if (e->closure.fci.object) {
+					zend_object_release(e->closure.fci.object);
+				}
+			}
+			Z_TRY_ADDREF(fci.function_name);
+			if (fci.object) {
+				GC_ADDREF(fci.object);
+			}
+			e->closure.fci = fci;
+			e->closure.fcc = fcc;
+		}
+		RETURN_ZVAL(getThis(), 1, 0);
 	}
 
 	q.request = msg_obj->message;
-	q.options = combined_options(getThis(), request);
+	q.options = combined_options(NULL, getThis(), request);
 	q.dtor = msg_queue_dtor;
 	q.opaque = msg_obj;
 	q.closure.fci = fci;
@@ -843,7 +877,7 @@ static PHP_METHOD(HttpClient, getResponse)
 		}
 
 		/* not found for the request! */
-		php_http_throw(unexpected_val, "Could not find response for the request", NULL);
+		php_http_throw(unexpected_val, "Could not find response for the request");
 		return;
 	}
 
@@ -986,6 +1020,7 @@ static int notify(zend_object_iterator *iter, void *puser)
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_notify, 0, 0, 0)
 	ZEND_ARG_OBJ_INFO(0, request, http\\Client\\Request, 1)
+	ZEND_ARG_INFO(0, progress)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpClient, notify)
 {
@@ -999,7 +1034,7 @@ static PHP_METHOD(HttpClient, notify)
 	observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp);
 
 	if (Z_TYPE_P(observers) != IS_OBJECT) {
-		php_http_throw(unexpected_val, "Observer storage is corrupted", NULL);
+		php_http_throw(unexpected_val, "Observer storage is corrupted");
 		return;
 	}
 
@@ -1045,7 +1080,7 @@ static PHP_METHOD(HttpClient, attach)
 	observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp);
 
 	if (Z_TYPE_P(observers) != IS_OBJECT) {
-		php_http_throw(unexpected_val, "Observer storage is corrupted", NULL);
+		php_http_throw(unexpected_val, "Observer storage is corrupted");
 		return;
 	}
 
@@ -1072,7 +1107,7 @@ static PHP_METHOD(HttpClient, detach)
 	observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp);
 
 	if (Z_TYPE_P(observers) != IS_OBJECT) {
-		php_http_throw(unexpected_val, "Observer storage is corrupted", NULL);
+		php_http_throw(unexpected_val, "Observer storage is corrupted");
 		return;
 	}
 
@@ -1094,7 +1129,7 @@ static PHP_METHOD(HttpClient, getObservers)
 	observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp);
 
 	if (Z_TYPE_P(observers) != IS_OBJECT) {
-		php_http_throw(unexpected_val, "Observer storage is corrupted", NULL);
+		php_http_throw(unexpected_val, "Observer storage is corrupted");
 		return;
 	}