From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH 2/4] http: avoid disconnecting on 404s for loose objects
Date: Sun, 10 Jul 2016 11:46:25 +0000 [thread overview]
Message-ID: <20160710114627.21504-2-e@80x24.org> (raw)
In-Reply-To: <20160710114627.21504-1-e@80x24.org>
Signed-off-by: Eric Wong <e@80x24.org>
---
http-walker.c | 9 +++++++++
http.c | 17 +++++++++++++++--
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/http-walker.c b/http-walker.c
index 9f28523..48f2df4 100644
--- a/http-walker.c
+++ b/http-walker.c
@@ -488,6 +488,15 @@ static int fetch_object(struct walker *walker, unsigned char *sha1)
req->localfile = -1;
}
+ /*
+ * we turned off CURLOPT_FAILONERROR to avoid losing a
+ * persistent connection and got CURLE_OK.
+ */
+ if (req->http_code == 404 && req->curl_result == CURLE_OK &&
+ (starts_with(req->url, "http://") ||
+ starts_with(req->url, "https://")))
+ req->curl_result = CURLE_HTTP_RETURNED_ERROR;
+
if (obj_req->state == ABORTED) {
ret = error("Request for %s aborted", hex);
} else if (req->curl_result != CURLE_OK &&
diff --git a/http.c b/http.c
index d8b2bec..afb25e1 100644
--- a/http.c
+++ b/http.c
@@ -1975,8 +1975,20 @@ 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;
+ CURL *curl = slot->curl;
+
+ if (curl) {
+ CURLcode c = curl_easy_getinfo(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);
@@ -2097,6 +2109,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);
--
EW
next prev parent reply other threads:[~2016-07-10 11:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-10 11:46 [PATCH 1/4] http-walker: remove unused parameter from fetch_object Eric Wong
2016-07-10 11:46 ` Eric Wong [this message]
2016-07-10 11:46 ` [PATCH 3/4] http-walker: reduce O(n) ops with doubly-linked list Eric Wong
2016-07-10 11:46 ` [PATCH 4/4] http-walker: use hashmap to eliminate list scan Eric Wong
-- strict thread matches above, loose matches on Subject: below --
2016-07-10 12:15 [PATCH 1/4] http-walker: remove unused parameter from fetch_object Eric Wong
2016-07-10 12:15 ` [PATCH 2/4] http: avoid disconnecting on 404s for loose objects Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160710114627.21504-2-e@80x24.org \
--to=e@80x24.org \
--cc=spew@80x24.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).