summaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-12-06 20:40:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-12-06 20:43:23 (GMT)
commit43ec089eea1d8eee125718b0b7a83720b036ae3e (patch)
tree008a9c9a9031e00102beed8c165894159def207c /http.c
parentcb4d2d35c4622ec2513c1c352d30ff8f9f9cdb9e (diff)
parentecba19531ac68586b4e06f6cc40e92447091bc28 (diff)
downloadgit-43ec089eea1d8eee125718b0b7a83720b036ae3e.zip
git-43ec089eea1d8eee125718b0b7a83720b036ae3e.tar.gz
git-43ec089eea1d8eee125718b0b7a83720b036ae3e.tar.bz2
Merge branch 'ew/http-walker' into jk/http-walker-limit-redirect
* ew/http-walker: list: avoid incompatibility with *BSD sys/queue.h http-walker: reduce O(n) ops with doubly-linked list http: avoid disconnecting on 404s for loose objects http-walker: remove unused parameter from fetch_object
Diffstat (limited to 'http.c')
-rw-r--r--http.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/http.c b/http.c
index a9778bf..7b66519 100644
--- a/http.c
+++ b/http.c
@@ -1885,8 +1885,19 @@ static size_t fwrite_sha1_file(char *ptr, size_t eltsize, size_t nmemb,
unsigned char expn[4096];
size_t size = eltsize * nmemb;
int posn = 0;
- struct http_object_request *freq =
- (struct http_object_request *)data;
+ struct http_object_request *freq = data;
+ struct active_request_slot *slot = freq->slot;
+
+ if (slot) {
+ CURLcode c = curl_easy_getinfo(slot->curl, CURLINFO_HTTP_CODE,
+ &slot->http_code);
+ if (c != CURLE_OK)
+ die("BUG: curl_easy_getinfo for HTTP code failed: %s",
+ curl_easy_strerror(c));
+ if (slot->http_code >= 400)
+ return size;
+ }
+
do {
ssize_t retval = xwrite(freq->localfile,
(char *) ptr + posn, size - posn);
@@ -2007,6 +2018,7 @@ struct http_object_request *new_http_object_request(const char *base_url,
freq->slot = get_active_slot();
curl_easy_setopt(freq->slot->curl, CURLOPT_FILE, freq);
+ curl_easy_setopt(freq->slot->curl, CURLOPT_FAILONERROR, 0);
curl_easy_setopt(freq->slot->curl, CURLOPT_WRITEFUNCTION, fwrite_sha1_file);
curl_easy_setopt(freq->slot->curl, CURLOPT_ERRORBUFFER, freq->errorstr);
curl_easy_setopt(freq->slot->curl, CURLOPT_URL, freq->url);