summaryrefslogtreecommitdiff
path: root/remote.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-03 14:16:08 -0800
committerJunio C Hamano <gitster@pobox.com>2016-02-03 14:16:08 -0800
commit30f302f7e7f407c0444b32e264aaa72c4081011e (patch)
treebc1409a1c5a3a96a7cd0e603a56e73daebca8ed3 /remote.c
parentad25723e69606d9f4f3596eeb427fde3abee76c3 (diff)
parent372370f1675c2b935fb703665358dd5567641107 (diff)
downloadgit-30f302f7e7f407c0444b32e264aaa72c4081011e.tar.gz
Merge branch 'kf/http-proxy-auth-methods'
New http.proxyAuthMethod configuration variable can be used to specify what authentication method to use, as a way to work around proxies that do not give error response expected by libcurl when CURLAUTH_ANY is used. Also, the codepath for proxy authentication has been taught to use credential API to store the authentication material in user's keyrings. * kf/http-proxy-auth-methods: http: use credential API to handle proxy authentication http: allow selection of proxy authentication method
Diffstat (limited to 'remote.c')
-rw-r--r--remote.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/remote.c b/remote.c
index 7d61dabebb..35940a5602 100644
--- a/remote.c
+++ b/remote.c
@@ -428,6 +428,9 @@ static int handle_config(const char *key, const char *value, void *cb)
} else if (!strcmp(subkey, ".proxy")) {
return git_config_string((const char **)&remote->http_proxy,
key, value);
+ } else if (!strcmp(subkey, ".proxyauthmethod")) {
+ return git_config_string((const char **)&remote->http_proxy_authmethod,
+ key, value);
} else if (!strcmp(subkey, ".vcs")) {
return git_config_string(&remote->foreign_vcs, key, value);
}