diff options
| author | Jeff King <peff@peff.net> | 2019-03-24 12:13:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-24 12:22:40 (GMT) |
| commit | 3d10f72ef8eaa229b285d39b4848aac41e5a8b02 (patch) | |
| tree | 80ebf8689a07f8668b4374eb41d98f5ba35ff8c6 /http-walker.c | |
| parent | ccbbd8bf66ca88385a34b16abcc1d5a800650d3a (diff) | |
| download | git-3d10f72ef8eaa229b285d39b4848aac41e5a8b02.zip git-3d10f72ef8eaa229b285d39b4848aac41e5a8b02.tar.gz git-3d10f72ef8eaa229b285d39b4848aac41e5a8b02.tar.bz2 | |
http: use normalize_curl_result() instead of manual conversion
When we switched off CURLOPT_FAILONERROR in 17966c0a63 (http: avoid
disconnecting on 404s for loose objects, 2016-07-11), the fetch_object()
function started manually handling 404's. Since we now have
normalize_curl_result() for use elsewhere, we can use it here as well,
shortening the code.
Note that we lose the check for http/https in the URL here. None of the
other result-normalizing code paths bother with this. Looking at
missing_target(), which checks specifically for an FTP-specific CURLcode
and "http" code 550, it seems likely that git-over-ftp has been subtly
broken since 17966c0a63. This patch does nothing to fix that, but nor
should it make anything worse (in fact, it may be slightly better
because we'll actually recognize an error as such, rather than assuming
CURLE_OK means we actually got some data).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http-walker.c')
| -rw-r--r-- | http-walker.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/http-walker.c b/http-walker.c index 7454369..48b1b3a 100644 --- a/http-walker.c +++ b/http-walker.c @@ -526,17 +526,8 @@ 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 >= 300 && req->curl_result == CURLE_OK && - (starts_with(req->url, "http://") || - starts_with(req->url, "https://"))) { - req->curl_result = CURLE_HTTP_RETURNED_ERROR; - xsnprintf(req->errorstr, sizeof(req->errorstr), - "HTTP request failed"); - } + normalize_curl_result(&req->curl_result, req->http_code, + req->errorstr, sizeof(req->errorstr)); if (obj_req->state == ABORTED) { ret = error("Request for %s aborted", hex); |