From 1b57557882891285ff53c243bb4ede8b1ccac79c Mon Sep 17 00:00:00 2001 From: ERAMOTO Masaya Date: Fri, 25 Nov 2016 13:26:51 +0900 Subject: url: Fix NO_PROXY env var to work properly with --proxy option. The combination of --noproxy option and http_proxy env var works well both for proxied hosts and non-proxied hosts. However, when combining NO_PROXY env var with --proxy option, non-proxied hosts are not reachable while proxied host is OK. This patch allows us to access non-proxied hosts even if using NO_PROXY env var with --proxy option. --- lib/url.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'lib/url.c') diff --git a/lib/url.c b/lib/url.c index 29beb3853..3cb7cba0e 100644 --- a/lib/url.c +++ b/lib/url.c @@ -6079,6 +6079,7 @@ static CURLcode create_conn(struct Curl_easy *data, bool reuse; char *proxy = NULL; char *socksproxy = NULL; + char *no_proxy = NULL; bool prot_missing = FALSE; bool connections_available = TRUE; bool force_reuse = FALSE; @@ -6255,14 +6256,21 @@ static CURLcode create_conn(struct Curl_easy *data, } } - if(data->set.str[STRING_NOPROXY] && - check_noproxy(conn->host.name, data->set.str[STRING_NOPROXY])) { + no_proxy = curl_getenv("no_proxy"); + if(!no_proxy) + no_proxy = curl_getenv("NO_PROXY"); + + if(check_noproxy(conn->host.name, data->set.str[STRING_NOPROXY]) || + (!data->set.str[STRING_NOPROXY] && + check_noproxy(conn->host.name, no_proxy))) { Curl_safefree(proxy); Curl_safefree(socksproxy); } else if(!proxy && !socksproxy) proxy = detect_proxy(conn); + Curl_safefree(no_proxy); + #ifdef USE_UNIX_SOCKETS if(data->set.str[STRING_UNIX_SOCKET_PATH]) { if(proxy) { -- cgit v1.2.3