mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-27 04:06:21 +02:00
Code

http: retry authentication failures for all http requests 

Commit 42653c0 (Prompt for a username when an HTTP request
401s, 2010-04-01) changed http_get_strbuf to prompt for
credentials when we receive a 401, but didn't touch
http_get_file. The latter is called only for dumb http;
while it's usually the case that people don't use
authentication on top of dumb http, there is no reason not
to allow both types of requests to use this feature.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2011-07-18 03:50:14 -04:00 committed by Junio C Hamano
parent 28d0c1017a
commit 8d677edc4f
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
http.c
View File

@ -846,13 +846,18 @@ static int http_request(const char *url, void *result, int target, int options)
return ret;
}
static int http_request_reauth(const char *url, void *result, int target,
int options)
{
int ret = http_request(url, result, target, options);
if (ret != HTTP_REAUTH)
return ret;
return http_request(url, result, target, options);
}
int http_get_strbuf(const char *url, struct strbuf *result, int options)
{
int http_ret = http_request(url, result, HTTP_REQUEST_STRBUF, options);
if (http_ret == HTTP_REAUTH) {
http_ret = http_request(url, result, HTTP_REQUEST_STRBUF, options);
}
return http_ret;
return http_request_reauth(url, result, HTTP_REQUEST_STRBUF, options);
}
/*
@ -875,7 +880,7 @@ static int http_get_file(const char *url, const char *filename, int options)
goto cleanup;
}
ret = http_request(url, result, HTTP_REQUEST_FILE, options);
ret = http_request_reauth(url, result, HTTP_REQUEST_FILE, options);
fclose(result);
if ((ret == HTTP_OK) && move_temp_to_file(tmpfile.buf, filename))