On Fri, Nov 4, 2011 at 18:13, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html