summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-28 09:01:14 -0700
committerJunio C Hamano <gitster@pobox.com>2016-10-28 09:01:14 -0700
commit50a6f65c2dee52fc3fe5a0e0b2f7460c71cf5a09 (patch)
tree7a574e0529c38de94e37d3c0642a9d20551a0a39
parentc00837c48a577390073d01203becc8ec0b1e700d (diff)
parent5275c3081c2b2c6166a2fc6b253a3acb20f8ae89 (diff)
downloadgit-50a6f65c2dee52fc3fe5a0e0b2f7460c71cf5a09.tar.xz
Merge branch 'dt/http-empty-auth' into maint
http.emptyauth configuration is a way to allow an empty username to pass when attempting to authenticate using mechanisms like Kerberos. We took an unspecified (NULL) username and sent ":" (i.e. no username, no password) to CURLOPT_USERPWD, but did not do the same when the username is explicitly set to an empty string. * dt/http-empty-auth: http: http.emptyauth should allow empty (not just NULL) usernames
-rw-r--r--http.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/http.c b/http.c
index 82ed542690..bd0dba23a0 100644
--- a/http.c
+++ b/http.c
@@ -351,7 +351,7 @@ static int http_options(const char *var, const char *value, void *cb)
static void init_curl_http_auth(CURL *result)
{
- if (!http_auth.username) {
+ if (!http_auth.username || !*http_auth.username) {
if (curl_empty_auth)
curl_easy_setopt(result, CURLOPT_USERPWD, ":");
return;