projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag 'RELEASE_1_4_0RC2'.
[m6w6/ext-http]
/
http_request_pool_api.c
diff --git
a/http_request_pool_api.c
b/http_request_pool_api.c
index dab929ea78370b2a370e43f3d472c893de96a8b2..154161404a4f3d0cb8f9c6cf9f1df4770ff6c59f 100644
(file)
--- a/
http_request_pool_api.c
+++ b/
http_request_pool_api.c
@@
-264,7
+264,7
@@
PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool)
#ifdef HAVE_CURL_MULTI_TIMEOUT
long max_tout = 1000;
#ifdef HAVE_CURL_MULTI_TIMEOUT
long max_tout = 1000;
- if (
CURLM_OK == curl_multi_timeout(pool->ch, &max_tout
)) {
+ if (
(CURLM_OK == curl_multi_timeout(pool->ch, &max_tout)) && (max_tout != -1
)) {
timeout.tv_sec = max_tout / 1000;
timeout.tv_usec = (max_tout % 1000) * 1000;
}
timeout.tv_sec = max_tout / 1000;
timeout.tv_usec = (max_tout % 1000) * 1000;
}