From 2ac1942c72fda6d2a1912fb4e8b6ebfc43ee9f30 Mon Sep 17 00:00:00 2001 From: ERAMOTO Masaya Date: Mon, 19 Dec 2016 16:27:24 +0900 Subject: 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 --- lib/url.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib/url.c') diff --git a/lib/url.c b/lib/url.c index d1a7afe1d..1f6e5bed9 100644 --- a/lib/url.c +++ b/lib/url.c @@ -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 */ -- cgit v1.2.3