From b2d91b894f4de331b74b734db8df06f163b5da0d Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Fri, 1 Mar 2019 14:48:04 +0100 Subject: [PATCH] fix #64 (by rcanavan) --- src/php_http_client_curl.h | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/src/php_http_client_curl.h b/src/php_http_client_curl.h index 21b6834..61723b9 100644 --- a/src/php_http_client_curl.h +++ b/src/php_http_client_curl.h @@ -43,13 +43,27 @@ typedef struct php_http_client_curl { static inline void php_http_client_curl_get_timeout(php_http_client_curl_t *curl, long max_tout, struct timeval *timeout) { - if ((CURLM_OK == curl_multi_timeout(curl->handle->multi, &max_tout)) && (max_tout > 0)) { - timeout->tv_sec = max_tout / 1000; - timeout->tv_usec = (max_tout % 1000) * 1000; - } else { - timeout->tv_sec = 0; - timeout->tv_usec = 1000; + timeout->tv_sec = 0; + timeout->tv_usec = 0; + + /* always returns CURLM_OK, check max_tout instead */ + curl_multi_timeout(curl->handle->multi, &max_tout); + + if (!max_tout) { + /* immediately */ + return; } + + if (max_tout < 0) { + /* 5ms */ + max_tout = 5; + } else if (max_tout > 1000) { + /* 1s */ + max_tout = 1000; + } + + timeout->tv_sec = max_tout / 1000; + timeout->tv_usec = (max_tout % 1000) * 1000; } PHP_HTTP_API void php_http_client_curl_responsehandler(php_http_client_t *client); -- 2.30.2