http: Avoid limit of retrying request only twice

Current code, after receiving HTTP_REAUTH, only retried
once, so couldn't do step 3 of the following sequence:

  1. We make a request; proxy returns 407, because we didn't give it a
     password. We ask for the password and return HTTP_REAUTH.

  2. We make another request; the proxy passes it to the actual server,
     who returns 401, because we didn't give an http password. We ask
     for the password and return HTTP_REAUTH.

  3. We make a third request, but this time everybody is happy.

Now we retry as long as we keep receiving HTTP_REAUTH, so the previous
sequence correctly completes.

Patch by Jeff King <peff@peff.net>

Signed-off-by: Nelson Benitez Leon <nbenitezl@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nelson Benitez Leon
2012-03-13 15:05:40 +01:00
committed by Junio C Hamano
parent 4896c4885e
commit 2217c38e5b

11
http.c
View File

@@ -875,10 +875,13 @@ static int http_request(const char *url, void *result, int target, int options)
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 ret;
do {
ret = http_request(url, result, target, options);
} while (ret == HTTP_REAUTH);
return ret;
}
int http_get_strbuf(const char *url, struct strbuf *result, int options)