From: Jeff King <peff@peff.net>
Date: Mon, 29 Oct 2012 08:13:09 +0000 (-0400)
Subject: Merge branch 'jk/maint-http-init-not-in-result-handler'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=58f3f9893dc287bd5b7ec4bbd3fc56b77e126e6c;p=git.git

Merge branch 'jk/maint-http-init-not-in-result-handler'

Further clean-up to the http codepath that picks up results after
cURL library is done with one request slot.

* jk/maint-http-init-not-in-result-handler:
  http: do not set up curl auth after a 401
  remote-curl: do not call run_slot repeatedly
---

58f3f9893dc287bd5b7ec4bbd3fc56b77e126e6c
diff --cc remote-curl.c
index 42716c59c,aefafd33d..278fecdd9
--- a/remote-curl.c
+++ b/remote-curl.c
@@@ -436,12 -454,8 +441,8 @@@ retry
  	curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0);
  	curl_easy_setopt(slot->curl, CURLOPT_POST, 1);
  	curl_easy_setopt(slot->curl, CURLOPT_URL, rpc->service_url);
 -	curl_easy_setopt(slot->curl, CURLOPT_ENCODING, "");
 +	curl_easy_setopt(slot->curl, CURLOPT_ENCODING, "gzip");
  
- 	headers = curl_slist_append(headers, rpc->hdr_content_type);
- 	headers = curl_slist_append(headers, rpc->hdr_accept);
- 	headers = curl_slist_append(headers, "Expect:");
- 
  	if (large_request) {
  		/* The request body is large and the size cannot be predicted.
  		 * We must use chunked encoding to send it.