From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Apr 2013 17:18:16 GMT
Subject: Re: What's cooking in git.git (Apr 2013, #05; Mon, 15)
Message-ID: <7va9oyo0mf.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20130416003038.GA5336@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> The solution is simple: now that FAILONERROR is a
> per-request setting, we move it to get_active_slot to make
> sure it is reset for each request.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> Hmph. I have no idea how this ever passed the tests, so I can only
> assume that I screwed up in running them. I even recall considering this
> issue while writing the patches, but I mixed up which of get_curl_handle
> and get_active_slot it needed to be in when I did so.

Thanks.

>  http.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/http.c b/http.c
> index 58c063c..48d4ff6 100644
> --- a/http.c
> +++ b/http.c
> @@ -282,7 +282,6 @@ static CURL *get_curl_handle(void)
>  #endif
>  	if (ssl_cainfo != NULL)
>  		curl_easy_setopt(result, CURLOPT_CAINFO, ssl_cainfo);
> -	curl_easy_setopt(result, CURLOPT_FAILONERROR, 1);
>  
>  	if (curl_low_speed_limit > 0 && curl_low_speed_time > 0) {
>  		curl_easy_setopt(result, CURLOPT_LOW_SPEED_LIMIT,
> @@ -506,6 +505,7 @@ struct active_request_slot *get_active_slot(void)
>  	curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDS, NULL);
>  	curl_easy_setopt(slot->curl, CURLOPT_UPLOAD, 0);
>  	curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1);
> +	curl_easy_setopt(slot->curl, CURLOPT_FAILONERROR, 1);
>  	if (http_auth.password)
>  		init_curl_http_auth(slot->curl);
Thanks