X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_client.c;h=f96164bbba08ad449733b745503149948412de03;hp=b2bd7f8c023f4e02261b01eedff1e178e74fb2c8;hb=refs%2Fheads%2Fv2.1.x;hpb=731b6a841374147b766c850b2a90c6bfade6f9f1

diff --git a/php_http_client.c b/php_http_client.c
index b2bd7f8..f96164b 100644
--- a/php_http_client.c
+++ b/php_http_client.c
@@ -377,6 +377,7 @@ static void handle_history(zval *zclient, php_http_message_t *request, php_http_
 
 static STATUS handle_response(void *arg, php_http_client_t *client, php_http_client_enqueue_t *e, php_http_message_t **request, php_http_message_t **response)
 {
+	zend_bool dequeue = 0;
 	zval zclient;
 	php_http_message_t *msg;
 	php_http_client_progress_state_t *progress;
@@ -390,7 +391,10 @@ static STATUS handle_response(void *arg, php_http_client_t *client, php_http_cli
 		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))) {
+		/* ensure the message is of type response (could be uninitialized in case of early error, like DNS) */
+		php_http_message_set_type(msg, PHP_HTTP_RESPONSE);
+
+		if (z_is_true(zend_read_property(php_http_client_class_entry, &zclient, ZEND_STRL("recordHistory"), 0 TSRMLS_CC))) {
 			handle_history(&zclient, *request, *response TSRMLS_CC);
 		}
 
@@ -427,8 +431,8 @@ static STATUS handle_response(void *arg, php_http_client_t *client, php_http_cli
 			zend_fcall_info_argn(&e->closure.fci TSRMLS_CC, 0);
 
 			if (retval) {
-				if (Z_TYPE_P(retval) == IS_BOOL && Z_BVAL_P(retval)) {
-					php_http_client_dequeue(client, e->request);
+				if (Z_TYPE_P(retval) == IS_BOOL) {
+					dequeue = Z_BVAL_P(retval);
 				}
 				zval_ptr_dtor(&retval);
 			}
@@ -444,6 +448,10 @@ static STATUS handle_response(void *arg, php_http_client_t *client, php_http_cli
 		client->callback.progress.func(client->callback.progress.arg, client, e, progress);
 	}
 
+	if (dequeue) {
+		php_http_client_dequeue(client, e->request);
+	}
+
 	return SUCCESS;
 }
 
@@ -720,7 +728,9 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_count, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpClient, count)
 {
-	if (SUCCESS == zend_parse_parameters_none()) {
+	long count_mode = -1;
+
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &count_mode)) {
 		php_http_client_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
 		RETVAL_LONG(zend_llist_count(&obj->client->requests));