summaryrefslogtreecommitdiff
path: root/notes-merge.h
diff options
context:
space:
mode:
authorLibravatar Stefan Zager <szager@google.com>2012-10-19 14:04:20 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-10-19 14:15:17 -0700
commit7202b81ffccf89605ce2726ff9d63202b5f1da7f (patch)
tree3078366221d7e05daa7dd3f140f85f2600668bbc /notes-merge.h
parentGit 1.7.12.4 (diff)
downloadtgif-7202b81ffccf89605ce2726ff9d63202b5f1da7f.tar.xz
Fix potential hang in https handshake
It has been observed that curl_multi_timeout may return a very long timeout value (e.g., 294 seconds and some usec) just before curl_multi_fdset returns no file descriptors for reading. The upshot is that select() will hang for a long time -- long enough for an https handshake to be dropped. The observed behavior is that the git command will hang at the terminal and never transfer any data. This patch is a workaround for a probable bug in libcurl. The bug only seems to manifest around a very specific set of circumstances: - curl version (from curl/curlver.h): #define LIBCURL_VERSION_NUM 0x071307 - git-remote-https running on an ubuntu-lucid VM. - Connecting through squid proxy running on another VM. Interestingly, the problem doesn't manifest if a host connects through squid proxy running on localhost; only if the proxy is on a separate VM (not sure if the squid host needs to be on a separate physical machine). That would seem to suggest that this issue is timing-sensitive. This patch is more or less in line with a recommendation in the curl docs about how to behave when curl_multi_fdset doesn't return and file descriptors: http://curl.haxx.se/libcurl/c/curl_multi_fdset.html Signed-off-by: Stefan Zager <szager@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions