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 /lib | |
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 'lib')
-rw-r--r-- | lib/url.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -6252,8 +6252,7 @@ static CURLcode create_conn(struct Curl_easy *data, else if(!proxy && !socksproxy) #ifndef CURL_DISABLE_HTTP /* if the host is not in the noproxy list, detect proxy. */ - if(!check_noproxy(conn->host.name, no_proxy)) - proxy = detect_proxy(conn); + proxy = detect_proxy(conn); #else /* !CURL_DISABLE_HTTP */ proxy = NULL; #endif /* CURL_DISABLE_HTTP */ |