global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-18 06:34:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

http: rename HTTP_REAUTH to HTTP_AUTH_RETRY

Browse Source 
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>
This commit is contained in:
Nelson Benitez Leon
2012-03-14 12:11:43 +01:00
committed by Junio C Hamano
parent 2217c38e5b
commit 72d62efe1c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
http.c
View File

@@ -840,7 +840,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) {
@@ -849,7 +849,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])
@@ -879,7 +879,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;
}

2
http.h
View File

@@ -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
/*