Re: [PATCH v3 2/3] http.c: Use timeout suggested by curl instead of fixed 50ms timeout
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:52:23
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH v3 2/3] http.c: Use timeout suggested by curl instead of fixed 50ms timeout · Mika Fischer <hidden>
- 2016-06-15 · Re: [PATCH v3 2/3] http.c: Use timeout suggested by curl instead of fixed 50ms timeout · Junio C Hamano <hidden>
Mika Fischer [off-list ref] writes:
Recent versions of curl can suggest a period of time the library user should sleep and try again, when curl is blocked on reading or writing (or connecting). Use this timeout instead of always sleeping for 50ms. Signed-off-by: Mika Fischer <redacted>
Thanks. I'm inclined to squash in the following to narrow the scope of curl_timeout, though.
diff --git a/http.c b/http.c
index 5cb0fb6..924be52 100644
--- a/http.c
+++ b/http.c@@ -636,9 +636,6 @@ void run_active_slot(struct active_request_slot *slot) fd_set excfds; int max_fd; struct timeval select_timeout; -#if LIBCURL_VERSION_NUM >= 0x070f04 - long curl_timeout; -#endif int finished = 0; slot->finished = &finished;
@@ -655,6 +652,7 @@ void run_active_slot(struct active_request_slot *slot) if (slot->in_use && !data_received) { #if LIBCURL_VERSION_NUM >= 0x070f04 + long curl_timeout; curl_multi_timeout(curlm, &curl_timeout); if (curl_timeout == 0) { continue;