romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-24 10:52:12 +03:00
Code Issues Projects Releases Packages Wiki Activity

proxy: read the "no_proxy" variable only if necessary

Browse source 
Reviewed-by: Daniel Stenberg

Closes #1919
This commit is contained in:
Michael Kaufmann 2017-09-24 15:21:44 +02:00
parent ff6774ea6a
commit c4ebd8b46d
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/url.c
View file

@ -5352,22 +5352,21 @@ static CURLcode create_conn_helper_init_proxy(struct connectdata *conn)
}
}
no_proxy = curl_getenv("no_proxy");
if(!no_proxy)
no_proxy = curl_getenv("NO_PROXY");
if(!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))) {
if(check_noproxy(conn->host.name, data->set.str[STRING_NOPROXY] ?
data->set.str[STRING_NOPROXY] : no_proxy)) {
Curl_safefree(proxy);
Curl_safefree(socksproxy);
}
else if(!proxy && !socksproxy)
#ifndef CURL_DISABLE_HTTP
else if(!proxy && !socksproxy)
/* if the host is not in the noproxy list, detect proxy. */
proxy = detect_proxy(conn);
#else /* !CURL_DISABLE_HTTP */
proxy = NULL;
#endif /* CURL_DISABLE_HTTP */
Curl_safefree(no_proxy);