Revision 5841520b034ab08f132f7d066a19163a9e3d4c07 authored by Enrique Tobis on 26 June 2015, 18:19:04 UTC, committed by Junio C Hamano on 29 June 2015, 16:57:43 UTC
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>
1 parent 3d4a3ff
File | Mode | Size |
---|---|---|
araxis | -rw-r--r-- | 392 bytes |
bc | -rw-r--r-- | 401 bytes |
bc3 | -rw-r--r-- | 24 bytes |
codecompare | -rw-r--r-- | 387 bytes |
deltawalker | -rw-r--r-- | 628 bytes |
diffmerge | -rw-r--r-- | 275 bytes |
diffuse | -rw-r--r-- | 282 bytes |
ecmerge | -rw-r--r-- | 340 bytes |
emerge | -rw-r--r-- | 404 bytes |
gvimdiff | -rw-r--r-- | 29 bytes |
gvimdiff2 | -rw-r--r-- | 29 bytes |
gvimdiff3 | -rw-r--r-- | 29 bytes |
kdiff3 | -rw-r--r-- | 488 bytes |
kompare | -rw-r--r-- | 83 bytes |
meld | -rw-r--r-- | 876 bytes |
opendiff | -rw-r--r-- | 301 bytes |
p4merge | -rw-r--r-- | 651 bytes |
tkdiff | -rw-r--r-- | 224 bytes |
tortoisemerge | -rw-r--r-- | 638 bytes |
vimdiff | -rw-r--r-- | 878 bytes |
vimdiff2 | -rw-r--r-- | 29 bytes |
vimdiff3 | -rw-r--r-- | 29 bytes |
xxdiff | -rw-r--r-- | 618 bytes |
Computing file changes ...