diff options
author | Enrique Tobis <Enrique.Tobis@twosigma.com> | 2015-06-26 18:19:04 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-06-29 09:57:43 -0700 |
commit | 5841520b034ab08f132f7d066a19163a9e3d4c07 (patch) | |
tree | 11d17eed434a9644c2694b7d5d83e635b390a7f8 /builtin/merge-ours.c | |
parent | Git 2.4 (diff) | |
download | tgif-5841520b034ab08f132f7d066a19163a9e3d4c07.tar.xz |
http: always use any proxy auth method available
We set CURLOPT_PROXYAUTH to use the most secure authentication
method available only when the user has set configuration variables
to specify a proxy. However, libcurl also supports specifying a
proxy through environment variables. In that case libcurl defaults
to only using the Basic proxy authentication method, because we do
not use CURLOPT_PROXYAUTH.
Set CURLOPT_PROXYAUTH to always use the most secure authentication
method available, even when there is no git configuration telling us
to use a proxy. This allows the user to use environment variables to
configure a proxy that requires an authentication method different
from Basic.
Signed-off-by: Enrique A. Tobis <etobis@twosigma.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions