summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-10-17 13:25:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-17 13:25:18 -0700
commitc6400bf8d5437e7614c86e6b027761e11ed7a1be (patch)
tree205970455b2a6be59a51255af289ec726fbc6792
parentSync with maint (diff)
parenthttp: http.emptyauth should allow empty (not just NULL) usernames (diff)
downloadtgif-c6400bf8d5437e7614c86e6b027761e11ed7a1be.tar.xz
Merge branch 'dt/http-empty-auth'
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 0c65639881..4c4a812fcc 100644
--- a/http.c
+++ b/http.c
@@ -372,7 +372,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;