moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

curl_multi_wait: only use internal timer if not -1 

commit 29bf0598aa introduced a problem when the "internal" timeout is
prefered to the given if shorter, as it didn't consider the case where
-1 was returned. Now the internal timeout is only considered if not -1.

Reported-by: Tor Arntsen
Bug: http://curl.haxx.se/mail/lib-2013-06/0015.html
This commit is contained in:
Daniel Stenberg 2013-06-04 13:22:40 +02:00
parent 159d34b58e
commit 0bf5ce77aa
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/multi.c
View File

@ -818,9 +818,10 @@ CURLMcode curl_multi_wait(CURLM *multi_handle,
return CURLM_BAD_HANDLE;
/* If the internally desired timeout is actually shorter than requested from
the outside, then use the shorter time! */
the outside, then use the shorter time! But only if the internal timer
is actually larger than 0! */
(void)multi_timeout(multi, &timeout_internal);
if(timeout_internal < (long)timeout_ms)
if((timeout_internal > 0) && (timeout_internal < (long)timeout_ms))
timeout_ms = (int)timeout_internal;
/* Count up how many fds we have from the multi handle */