X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_client.c;h=a272fa45d0a4f6c2658b20273b828b57f7c0097f;hp=f1ef55d578b451aabc0d94aa8227e6a5003509b4;hb=58e3a73e85335ce1ed3bd59f3a379bacb061c915;hpb=b63ba83de3d26c61062b72a8d5675225297302db

diff --git a/src/php_http_client.c b/src/php_http_client.c
index f1ef55d..a272fa4 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;
@@ -632,9 +646,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, Z_OBJ_P(client), ZEND_STRL("options"), 0, &z_options_tmp);
 
@@ -649,8 +662,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);
 	}
@@ -713,7 +730,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;
@@ -769,19 +786,33 @@ 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);
+			}
+		}
+		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;
@@ -804,7 +835,7 @@ static PHP_METHOD(HttpClient, requeue)
 	RETVAL_ZVAL(getThis(), 1, 0);
 }
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(ai_HttpClient_count, 0, 0, IS_LONG, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(ai_HttpClient_count, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpClient, count)
 {
@@ -984,7 +1015,11 @@ static int notify(zend_object_iterator *iter, void *puser)
 	return ZEND_HASH_APPLY_STOP;
 }
 
+#if PHP_VERSION_ID >= 80100
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(ai_HttpClient_notify, 0, 0, IS_VOID, 0)
+#else
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_notify, 0, 0, 0)
+#endif
 	ZEND_ARG_OBJ_INFO(0, request, http\\Client\\Request, 1)
 	ZEND_ARG_INFO(0, progress)
 ZEND_END_ARG_INFO();
@@ -1028,11 +1063,16 @@ static PHP_METHOD(HttpClient, notify)
 			zval_ptr_dtor(zprogress);
 		}
 	}
-
+#if PHP_VERSION_ID < 80100
 	RETVAL_ZVAL(getThis(), 1, 0);
+#endif
 }
 
+#if PHP_VERSION_ID >= 80100
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(ai_HttpClient_attach, 0, 1, IS_VOID, 0)
+#else
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_attach, 0, 0, 1)
+#endif
 	ZEND_ARG_OBJ_INFO(0, observer, SplObserver, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpClient, attach)
@@ -1057,11 +1097,16 @@ static PHP_METHOD(HttpClient, attach)
 	ZVAL_UNDEF(&retval);
 	zend_call_method_with_1_params(Z_OBJ_P(observers), NULL, NULL, "attach", &retval, observer);
 	zval_ptr_dtor(&retval);
-
+#if PHP_VERSION_ID < 80100
 	RETVAL_ZVAL(getThis(), 1, 0);
+#endif
 }
 
+#if PHP_VERSION_ID >= 80100
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(ai_HttpClient_detach, 0, 1, IS_VOID, 0)
+#else
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_detach, 0, 0, 1)
+#endif
 	ZEND_ARG_OBJ_INFO(0, observer, SplObserver, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpClient, detach)
@@ -1080,8 +1125,9 @@ static PHP_METHOD(HttpClient, detach)
 	ZVAL_UNDEF(&retval);
 	zend_call_method_with_1_params(Z_OBJ_P(observers), NULL, NULL, "detach", &retval, observer);
 	zval_ptr_dtor(&retval);
-
+#if PHP_VERSION_ID < 80100
 	RETVAL_ZVAL(getThis(), 1, 0);
+#endif
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_getObservers, 0, 0, 0)