From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Nov 2012 03:44:36 +0000 (-0800)
Subject: Merge branch 'sz/maint-curl-multi-timeout' into maint
X-Git-Tag: v1.8.0.1~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b56a4702209a6054bd1eb89e9d63abfd6f4cf2e;p=thirdparty%2Fgit.git

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

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.  A
workaround has been added for this.

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

8b56a4702209a6054bd1eb89e9d63abfd6f4cf2e