projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (from parent 1:
a0a3438
)
fix #64 (by rcanavan)
author
Michael Wallner
<mike@php.net>
Fri, 1 Mar 2019 13:48:04 +0000
(14:48 +0100)
committer
Michael Wallner
<mike@php.net>
Fri, 1 Mar 2019 13:48:04 +0000
(14:48 +0100)
src/php_http_client_curl.h
patch
|
blob
|
history
diff --git
a/src/php_http_client_curl.h
b/src/php_http_client_curl.h
index 21b6834121d3ecba82864495048dd015273f9b0d..61723b9b7c4f2fabb42bffd9baabc17c81c4c269 100644
(file)
--- 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)
{
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);
}
PHP_HTTP_API void php_http_client_curl_responsehandler(php_http_client_t *client);