[PATCH 2/3] http: Avoid limit of retrying request only twice
From: Nelson Benitez Leon <hidden>
Date: 2016-06-15 22:53:49
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Jeff King <redacted>
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 [off-list ref]
Signed-off-by: Nelson Benitez Leon <redacted>
Signed-off-by: Junio C Hamano <redacted>
---
http.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/http.c b/http.c
index 624d1a0..d34d741 100644
--- a/http.c
+++ b/http.c@@ -852,10 +852,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)
--
1.7.7.6