git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d9253f2 7202b81)
Merge branch 'sz/maint-curl-multi-timeout'
authorJeff King <redacted>
Fri, 9 Nov 2012 17:50:56 +0000 (12:50 -0500)
committerJeff King <redacted>
Fri, 9 Nov 2012 17:50:56 +0000 (12:50 -0500)
commit23a50a1fb113b702012935ee8c6e945cf58edbd7
treea32ffbe8fff59309754be09efb2bbe037f168b2dtree | snapshot
parentd9253f2bc8b17249a433494a54dbe0d22ae8c5d0commit | diff
parent7202b81ffccf89605ce2726ff9d63202b5f1da7fcommit | diff
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
http.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT