]> granicus.if.org Git - curl/commit
curl_multi_wait: only use internal timer if not -1
authorDaniel Stenberg <daniel@haxx.se>
Tue, 4 Jun 2013 11:22:40 +0000 (13:22 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Tue, 4 Jun 2013 11:22:40 +0000 (13:22 +0200)
commit0bf5ce77aabe7307e41db13a0d03a63517fdc366
tree4327e3094f0afdc4d391c9024deac4b720c63364
parent159d34b58e9b7771efe254949895d8f6253670db
curl_multi_wait: only use internal timer if not -1

commit 29bf0598aad5 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
lib/multi.c