From: Jeff King <peff@peff.net>
Date: Fri, 9 Nov 2012 17:50:56 +0000 (-0500)
Subject: Merge branch 'sz/maint-curl-multi-timeout'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=23a50a1fb113b702012935ee8c6e945cf58edbd7;p=git.git

Merge branch 'sz/maint-curl-multi-timeout'

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
---

23a50a1fb113b702012935ee8c6e945cf58edbd7