Re: [PATCH v3 2/3] http.c: Use timeout suggested by curl instead of fixed 50ms timeout
- From
Mika Fischer <mika.fischer@zoopnet.de>
- Date
- Nov 4, 2011, 17:47 UTC
- Message-ID
- <CAOs=hRKxc9SdE_HTnfs+WdnxZEY6yF9MBV_K1FX2=7B7xtj7-w@mail.gmail.com>
- In-Reply-To
- <7vehxndd4q.fsf@alter.siamese.dyndns.org>
On Fri, Nov 4, 2011 at 18:13, Junio C Hamano <gitster@pobox.com> wrote:
Show 25 quoted lines
> 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;Ah yes, that's good. I would have done it this way in C++, but I wasn't sure whether C99 is OK for git.