diff options
author | Jiang Xin <xin.jiang@huawei.com> | 2016-02-29 18:16:57 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-02-29 22:28:39 +0300 |
commit | d445fda44dbf031dccdfd384b2418ea50988a756 (patch) | |
tree | 1116afb087a7e8017a8dab95ca66179fdcb60c03 /merge-recursive.c | |
parent | 372370f1675c2b935fb703665358dd5567641107 (diff) |
http: honor no_http env variable to bypass proxy
Curl and its families honor several proxy related environment variables:
* http_proxy and https_proxy define proxy for http/https connections.
* no_proxy (a comma separated hosts) defines hosts bypass the proxy.
This command will bypass the bad-proxy and connect to the host directly:
no_proxy=* https_proxy=http://bad-proxy/ \
curl -sk https://google.com/
Before commit 372370f (http: use credential API to handle proxy auth...),
Environment variable "no_proxy" will take effect if the config variable
"http.proxy" is not set. So the following comamnd won't fail if not
behind a firewall.
no_proxy=* https_proxy=http://bad-proxy/ \
git ls-remote https://github.com/git/git
But commit 372370f not only read git config variable "http.proxy", but
also read "http_proxy" and "https_proxy" environment variables, and set
the curl option using:
curl_easy_setopt(result, CURLOPT_PROXY, proxy_auth.host);
This caused "no_proxy" environment variable not working any more.
Set extra curl option "CURLOPT_NOPROXY" will fix this issue.
Signed-off-by: Jiang Xin <xin.jiang@huawei.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions