| commit | 30f302f7e7f407c0444b32e264aaa72c4081011e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Feb 2016 22:16:08 +0000 (3 14:16 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Feb 2016 22:16:08 +0000 (3 14:16 -0800) | ||
| tree | bc1409a1c5a3a96a7cd0e603a56e73daebca8ed3 | treesnapshot (tar.gz zip) |
| parent | ad25723e69606d9f4f3596eeb427fde3abee76c3 | commitdiff |
| parent | 372370f1675c2b935fb703665358dd5567641107 | commitdiff |
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
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
| Documentation/config.txt | diff1 | diff2 | blobhistory |
| remote.c | diff1 | diff2 | blobhistory |