Merge branch 'sz/maint-curl-multi-timeout' into next
commitf696dd84be01f785217b8923ab13783b77f902a8
authorJeff King <peff@peff.net>
Sun, 4 Nov 2012 13:16:45 +0000 (4 08:16 -0500)
committerJeff King <peff@peff.net>
Sun, 4 Nov 2012 13:16:45 +0000 (4 08:16 -0500)
tree1531d687b5bd962d23af879ae1f2fef0aa9f407f
parent0a6366e780a093346fe8e8e64806557ccd5b339f
parent7202b81ffccf89605ce2726ff9d63202b5f1da7f
Merge branch 'sz/maint-curl-multi-timeout' into next

Sometimes curl_multi_timeout() function suggested a wrong timeout
value when there is no file descriptors to wait on and the http
transport ended up sleeping for minutes in select(2) system call.
Detect this and reduce the wait timeout in such a case.

* sz/maint-curl-multi-timeout:
  Fix potential hang in https handshake
http.c