From: Nelson Benitez Leon <nelsonjesus.benitez@seap.minhap.es>
To: git@vger.kernel.org
Cc: peff@peff.net, sam@vilain.net
Subject: [PATCH v4 4/5] http: Avoid limit of retrying request only twice
Date: Mon, 12 Mar 2012 18:29:09 +0100 [thread overview]
Message-ID: <4F5E3265.2030006@seap.minhap.es> (raw)
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>
---
http.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/http.c b/http.c
index 14edf5a..9b98179 100644
--- a/http.c
+++ b/http.c
@@ -858,10 +858,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
reply other threads:[~2012-03-12 16:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=4F5E3265.2030006@seap.minhap.es \
--to=nelsonjesus.benitez@seap.minhap.es \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=sam@vilain.net \
/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 NNTP newsgroup(s).