diff options
| author | ERAMOTO Masaya <eramoto.masaya@jp.fujitsu.com> | 2016-12-19 16:27:24 +0900 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-01-13 11:18:29 +0100 |
| commit | 2ac1942c72fda6d2a1912fb4e8b6ebfc43ee9f30 (patch) | |
| tree | 7b0bc441f7d466da9e142517a866f1f104b5f27f /docs | |
| parent | efdbfde7ca205f256c4e8b473c775cf73557cfd7 (diff) | |
url: --noproxy option overrides NO_PROXY environment variable
Under condition using http_proxy env var, noproxy list was the
combination of --noproxy option and NO_PROXY env var previously. Since
this commit, --noproxy option overrides NO_PROXY environment variable
even if use http_proxy env var.
Closes #1140
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/cmdline-opts/noproxy.d | 4 | ||||
| -rw-r--r-- | docs/cmdline-opts/page-footer | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/docs/cmdline-opts/noproxy.d b/docs/cmdline-opts/noproxy.d index 4f06d9f5d..e0d2d598c 100644 --- a/docs/cmdline-opts/noproxy.d +++ b/docs/cmdline-opts/noproxy.d @@ -9,3 +9,7 @@ effectively disables the proxy. Each name in this list is matched as either a domain which contains the hostname, or the hostname itself. For example, local.com would match local.com, local.com:80, and www.local.com, but not www.notlocal.com. + +Since 7.52.2, This option overrides the environment variables that disable +the proxy. If there's an environment variable disabling a proxy, you can set +noproxy list to \&"" to override it. diff --git a/docs/cmdline-opts/page-footer b/docs/cmdline-opts/page-footer index 94412c703..c7b1ae014 100644 --- a/docs/cmdline-opts/page-footer +++ b/docs/cmdline-opts/page-footer @@ -23,6 +23,16 @@ Sets the proxy server to use if no protocol-specific proxy is set. .IP "NO_PROXY <comma-separated list of hosts>" list of host names that shouldn't go through any proxy. If set to a asterisk \&'*' only, it matches all hosts. + +Since 7.52.2, this environment variable disable the proxy even if specify +--proxy option. That is +.B NO_PROXY=direct.example.com curl -x http://proxy.example.com +.B http://direct.example.com +accesses the target URL directly, and +.B NO_PROXY=direct.example.com curl -x http://proxy.example.com +.B http://somewhere.example.com +accesses the target URL through proxy. + .SH "PROXY PROTOCOL PREFIXES" Since curl version 7.21.7, the proxy string may be specified with a protocol:// prefix to specify alternative proxy protocols. |