>From aa77ab3dd5b98a5786ac158528f45355fc0ddbc3 Mon Sep 17 00:00:00 2001 From: Stefan Zager <sza...@google.com> Date: Thu, 18 Oct 2012 16:23:53 -0700 Subject: [PATCH] Fix potential hang in https handshake.
It will sometimes happen that curl_multi_fdset() doesn't return any file descriptors. In that case, it's recommended that the application sleep for a short time before running curl_multi_perform() again. http://curl.haxx.se/libcurl/c/curl_multi_fdset.html Signed-off-by: Stefan Zager <sza...@google.com> --- http.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/http.c b/http.c index df9bb71..e8aba7f 100644 --- a/http.c +++ b/http.c @@ -630,6 +630,10 @@ void run_active_slot(struct active_request_slot *slot) FD_ZERO(&writefds); FD_ZERO(&excfds); curl_multi_fdset(curlm, &readfds, &writefds, &excfds, &max_fd); + if (max_fd < 0) { + select_timeout.tv_sec = 0; + select_timeout.tv_usec = 50000; + } select(max_fd+1, &readfds, &writefds, &excfds, &select_timeout); } -- 1.7.7.3 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
