From: Nelson Benitez Leon <nelsonjesus.benitez@seap•minhap.es>
To: git@vger•kernel.org
Cc: Jeff King <peff@peff•net>
Subject: [PATCH 3/3] http: rename HTTP_REAUTH to HTTP_AUTH_RETRY
Date: Fri, 11 May 2012 15:14:08 +0200 [thread overview]
Message-ID: <4FAD10A0.6040306@seap.minhap.es> (raw)
The semantics of HTTP_REAUTH have been always more
of a retry rather than a re-authentication, so we
rename it to HTTP_AUTH_RETRY to make it more clear.
Signed-off-by: Nelson Benitez Leon <nbenitezl@gmail•com>
Signed-off-by: Junio C Hamano <gitster@pobox•com>
---
http.c | 6 +++---
http.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/http.c b/http.c
index d34d741..0023119 100644
--- a/http.c
+++ b/http.c
@@ -817,7 +817,7 @@ static int http_request(const char *url, void *result, int target, int options)
} else {
credential_fill(&http_auth);
init_curl_http_auth(slot->curl);
- ret = HTTP_REAUTH;
+ ret = HTTP_AUTH_RETRY;
}
} else if (results.http_code == 407) { /* Proxy authentication failure */
if (proxy_auth.username && proxy_auth.password) {
@@ -826,7 +826,7 @@ static int http_request(const char *url, void *result, int target, int options)
} else {
credential_fill(&proxy_auth);
set_proxy_auth(slot->curl);
- ret = HTTP_REAUTH;
+ ret = HTTP_AUTH_RETRY;
}
} else {
if (!curl_errorstr[0])
@@ -856,7 +856,7 @@ static int http_request_reauth(const char *url, void *result, int target,
do {
ret = http_request(url, result, target, options);
- } while (ret == HTTP_REAUTH);
+ } while (ret == HTTP_AUTH_RETRY);
return ret;
}
diff --git a/http.h b/http.h
index 915c286..629bbcf 100644
--- a/http.h
+++ b/http.h
@@ -123,7 +123,7 @@ extern char *get_remote_object_url(const char *url, const char *hex,
#define HTTP_MISSING_TARGET 1
#define HTTP_ERROR 2
#define HTTP_START_FAILED 3
-#define HTTP_REAUTH 4
+#define HTTP_AUTH_RETRY 4
#define HTTP_NOAUTH 5
/*
--
1.7.7.6
reply other threads:[~2012-05-11 12:18 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=4FAD10A0.6040306@seap.minhap.es \
--to=nelsonjesus.benitez@seap$(echo .)minhap.es \
--cc=git@vger$(echo .)kernel.org \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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