* [PATCH 6/6] http: rename HTTP_REAUTH to HTTP_AUTH_RETRY
@ 2012-05-03 16:40 Nelson Benitez Leon
2012-05-04 7:25 ` Jeff King
0 siblings, 1 reply; 2+ messages in thread
From: Nelson Benitez Leon @ 2012-05-03 16:40 UTC (permalink / raw)
To: git; +Cc: Jeff King
After adding the proxy authentication support in http, the semantics
of HTTP_REAUTH changed more to a retry rather than a re-authentication,
so we rename it to HTTP_AUTH_RETRY.
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 1468ec7..ba07e12 100644
--- a/http.c
+++ b/http.c
@@ -877,7 +877,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) {
@@ -886,7 +886,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])
@@ -916,7 +916,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 483e3ed..4bfa267 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 6/6] http: rename HTTP_REAUTH to HTTP_AUTH_RETRY
2012-05-03 16:40 [PATCH 6/6] http: rename HTTP_REAUTH to HTTP_AUTH_RETRY Nelson Benitez Leon
@ 2012-05-04 7:25 ` Jeff King
0 siblings, 0 replies; 2+ messages in thread
From: Jeff King @ 2012-05-04 7:25 UTC (permalink / raw)
To: Nelson Benitez Leon; +Cc: git
On Thu, May 03, 2012 at 06:40:40PM +0200, Nelson Benitez Leon wrote:
> After adding the proxy authentication support in http, the semantics
> of HTTP_REAUTH changed more to a retry rather than a re-authentication,
> so we rename it to HTTP_AUTH_RETRY.
The patch looks fine, but a minor nit on the rationale. It has nothing
to do with the proxy auth. It has always been a bad name. It is not "you
should re-authenticate", but rather "I have already re-authenticated,
and therefore you should call me again to retry".
-Peff
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-05-04 7:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-03 16:40 [PATCH 6/6] http: rename HTTP_REAUTH to HTTP_AUTH_RETRY Nelson Benitez Leon
2012-05-04 7:25 ` Jeff King
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox