X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_client_curl_user.c;h=c2be6807d72cd87ffdd37002cf9dd1325ab6a7cc;hp=94d7f41294818f49a3cb3f0776e72320faf1adf8;hb=88362013f6230e939a14658d9123dc984f5807c6;hpb=55d74c2d07edcf6d51fe62bc257c3bde0f7f25d4

diff --git a/src/php_http_client_curl_user.c b/src/php_http_client_curl_user.c
index 94d7f41..c2be680 100644
--- a/src/php_http_client_curl_user.c
+++ b/src/php_http_client_curl_user.c
@@ -43,6 +43,7 @@ static void php_http_client_curl_user_handler(INTERNAL_FUNCTION_PARAMETERS)
 	long action = 0;
 	php_socket_t fd = CURL_SOCKET_TIMEOUT;
 	php_http_client_object_t *client = NULL;
+	php_http_client_curl_t *curl;
 
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|rl", &zclient, php_http_client_class_entry, &zstream, &action)) {
 		return;
@@ -57,6 +58,9 @@ static void php_http_client_curl_user_handler(INTERNAL_FUNCTION_PARAMETERS)
 		}
 	}
 	php_http_client_curl_loop(client->client, fd, action);
+
+	curl = client->client->ctx;
+	RETVAL_LONG(curl->unfinished);
 }
 
 static void php_http_client_curl_user_timer(CURLM *multi, long timeout_ms, void *timer_data)
@@ -243,8 +247,6 @@ static void php_http_client_curl_user_dtor(void **context)
 	fprintf(stderr, "D");
 #endif
 
-	ZEND_ASSERT(ctx);
-
 	curl = ctx->client->ctx;
 
 	curl_multi_setopt(curl->handle->multi, CURLMOPT_SOCKETDATA, NULL);