mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sn/http-auth-with-netrc-fix'

Browse Source 
* sn/http-auth-with-netrc-fix:
  http: don't always prompt for password
This commit is contained in:
Junio C Hamano
2011-11-06 21:22:19 -08:00
parent de26347950 986bbc0842
commit 78c17b9943
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
http.c
View File

@ -279,8 +279,6 @@ static CURL *get_curl_handle(void)
curl_easy_setopt(result, CURLOPT_HTTPAUTH, CURLAUTH_ANY); curl_easy_setopt(result, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
#endif #endif
init_curl_http_auth(result);
if (ssl_cert != NULL) if (ssl_cert != NULL)
curl_easy_setopt(result, CURLOPT_SSLCERT, ssl_cert); curl_easy_setopt(result, CURLOPT_SSLCERT, ssl_cert);
if (has_cert_password()) if (has_cert_password())
@ -846,7 +844,7 @@ static int http_request(const char *url, void *result, int target, int options)
else if (missing_target(&results)) else if (missing_target(&results))
ret = HTTP_MISSING_TARGET; ret = HTTP_MISSING_TARGET;
else if (results.http_code == 401) { else if (results.http_code == 401) {
if (user_name) { if (user_name && user_pass) {
ret = HTTP_NOAUTH; ret = HTTP_NOAUTH;
} else { } else {
/* /*
@ -855,7 +853,8 @@ static int http_request(const char *url, void *result, int target, int options)
* but that is non-portable. Using git_getpass() can at least be stubbed * but that is non-portable. Using git_getpass() can at least be stubbed
* on other platforms with a different implementation if/when necessary. * on other platforms with a different implementation if/when necessary.
*/ */
user_name = xstrdup(git_getpass_with_description("Username", description)); if (!user_name)
user_name = xstrdup(git_getpass_with_description("Username", description));
init_curl_http_auth(slot->curl); init_curl_http_auth(slot->curl);
ret = HTTP_REAUTH; ret = HTTP_REAUTH;
} }