From 88362013f6230e939a14658d9123dc984f5807c6 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Wed, 15 Jun 2016 16:08:39 +0200 Subject: [PATCH] return count of still unfinished requests from run callback --- src/php_http_client_curl_user.c | 4 ++++ src/php_http_client_curl_user.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/php_http_client_curl_user.c b/src/php_http_client_curl_user.c index 6fdfa36..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) diff --git a/src/php_http_client_curl_user.h b/src/php_http_client_curl_user.h index 8a6778f..e731f41 100644 --- a/src/php_http_client_curl_user.h +++ b/src/php_http_client_curl_user.h @@ -36,7 +36,7 @@ interface http\Client\Curl\User * - timeout occurs * - a watched socket needs action * - * @param callable $run callback as function(http\Client $client, resource $socket = null, int $action = http\Client\Curl\User::POLL_NONE) + * @param callable $run callback as function(http\Client $client, resource $socket = null, int $action = http\Client\Curl\User::POLL_NONE):int (returns unfinished requests pending) */ function init(callable $run); -- 2.30.2