From: Jonathan Tan <jonathantanmy@google.com>
To: git@vger.kernel.org
Cc: Jonathan Tan <jonathantanmy@google.com>, steadmon@google.com
Subject: [PATCH 8/8] remote-curl: in v2, fill credentials if needed
Date: Tue, 5 Feb 2019 16:21:22 -0800 [thread overview]
Message-ID: <8d5ff2fc224e2ce7981bcae492de02a622889208.1549411880.git.jonathantanmy@google.com> (raw)
In-Reply-To: <cover.1549411880.git.jonathantanmy@google.com>
In post_rpc(), remote-curl calls credential_fill() if HTTP_REAUTH is
returned, but this is not true in proxy_request(). Do this in
proxy_request() too.
When t5551 is run using GIT_TEST_PROTOCOL_VERSION=2, one of the tests
that used to fail now pass.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
---
remote-curl.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/remote-curl.c b/remote-curl.c
index 293bcdb95b..437a8e76d8 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -1295,7 +1295,9 @@ static size_t proxy_out(char *buffer, size_t eltsize,
static int proxy_request(struct proxy_state *p)
{
struct active_request_slot *slot;
+ int err;
+retry:
slot = get_active_slot();
curl_easy_setopt(slot->curl, CURLOPT_ENCODING, "");
@@ -1312,7 +1314,12 @@ static int proxy_request(struct proxy_state *p)
curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, proxy_out);
curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, p);
- if (run_slot(slot, NULL) != HTTP_OK)
+ err = run_slot(slot, NULL);
+ if (err == HTTP_REAUTH) {
+ credential_fill(&http_auth);
+ goto retry;
+ }
+ if (err != HTTP_OK)
return -1;
return 0;
--
2.19.0.271.gfe8321ec05.dirty
next prev parent reply other threads:[~2019-02-06 0:21 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-06 0:21 [PATCH 0/8] Resend of GIT_TEST_PROTOCOL_VERSION patches Jonathan Tan
2019-02-06 0:21 ` [PATCH 1/8] tests: define GIT_TEST_PROTOCOL_VERSION Jonathan Tan
2019-02-06 21:58 ` Ævar Arnfjörð Bjarmason
2019-02-07 0:01 ` Jonathan Tan
2019-02-11 20:20 ` Jeff King
2019-02-06 0:21 ` [PATCH 2/8] tests: always test fetch of unreachable with v0 Jonathan Tan
2019-02-11 20:30 ` Jeff King
2019-02-14 19:58 ` Jonathan Tan
2019-02-21 13:49 ` Jeff King
2019-02-22 20:47 ` Junio C Hamano
2019-02-23 13:25 ` Jeff King
2019-02-06 0:21 ` [PATCH 3/8] t5503: fix overspecification of trace expectation Jonathan Tan
2019-02-06 0:21 ` [PATCH 4/8] t5512: compensate for v0 only sending HEAD symrefs Jonathan Tan
2019-02-06 0:21 ` [PATCH 5/8] t5700: only run with protocol version 1 Jonathan Tan
2019-02-06 0:21 ` [PATCH 6/8] tests: fix protocol version for overspecifications Jonathan Tan
2019-02-06 0:21 ` [PATCH 7/8] t5552: compensate for v2 filtering ref adv Jonathan Tan
2019-02-06 0:21 ` Jonathan Tan [this message]
2019-02-06 21:29 ` [PATCH 8/8] remote-curl: in v2, fill credentials if needed Jeff King
2019-02-11 19:20 ` Jonathan Tan
2019-02-11 20:38 ` Jeff King
2019-02-06 21:34 ` [PATCH 0/8] Resend of GIT_TEST_PROTOCOL_VERSION patches Jeff King
2019-02-06 21:52 ` Ævar Arnfjörð Bjarmason
2019-02-06 22:10 ` Jeff King
2019-02-06 22:20 ` Ævar Arnfjörð Bjarmason
2019-02-06 23:08 ` Jeff King
2019-02-07 10:49 ` Ævar Arnfjörð Bjarmason
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8d5ff2fc224e2ce7981bcae492de02a622889208.1549411880.git.jonathantanmy@google.com \
--to=jonathantanmy@google.com \
--cc=git@vger.kernel.org \
--cc=steadmon@google.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).