projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b98769e 7202b81)
Merge branch 'sz/maint-curl-multi-timeout' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2012 03:44:36 +0000 (19:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2012 03:44:36 +0000 (19:44 -0800)
commit8b56a4702209a6054bd1eb89e9d63abfd6f4cf2e
treef431ee2c5b4a01d619419909b0cfeeaf222a447dtree | snapshot
parentb98769e06e50009b1b7b1ca465c0f3b0cf0f6fa3commit | diff
parent7202b81ffccf89605ce2726ff9d63202b5f1da7fcommit | diff
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
Git—the stupid content tracker