Commit 2ac1942c authored by ERAMOTO Masaya's avatar ERAMOTO Masaya Committed by Daniel Stenberg
Browse files

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
parent efdbfde7

docs/cmdline-opts/noproxy.d

+4 −0
Original line number Original line Diff line number Diff line
@@ -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,

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

local.com would match local.com, local.com:80, and www.local.com, but not

www.notlocal.com.

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.

docs/cmdline-opts/page-footer

+10 −0
Original line number Original line Diff line number Diff line
@@ -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>"

.IP "NO_PROXY <comma-separated list of hosts>"

list of host names that shouldn't go through any proxy. If set to a asterisk

list of host names that shouldn't go through any proxy. If set to a asterisk

\&'*' only, it matches all hosts.

\&'*' 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"

.SH "PROXY PROTOCOL PREFIXES"

Since curl version 7.21.7, the proxy string may be specified with a

Since curl version 7.21.7, the proxy string may be specified with a

protocol:// prefix to specify alternative proxy protocols.

protocol:// prefix to specify alternative proxy protocols.

lib/url.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -6252,7 +6252,6 @@ static CURLcode create_conn(struct Curl_easy *data, 
  else if(!proxy && !socksproxy)

  else if(!proxy && !socksproxy)

#ifndef CURL_DISABLE_HTTP

#ifndef CURL_DISABLE_HTTP

    /* if the host is not in the noproxy list, detect proxy. */

    /* 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 */

#else  /* !CURL_DISABLE_HTTP */

    proxy = NULL;

    proxy = NULL;

tests/data/Makefile.inc

+1 −0
Original line number Original line Diff line number Diff line
@@ -128,6 +128,7 @@ test1220 test1221 test1222 test1223 test1224 test1225 test1226 test1227 \ 
test1228 test1229 test1230 test1231 test1232 test1233 test1234 test1235 \

test1228 test1229 test1230 test1231 test1232 test1233 test1234 test1235 \

test1236 test1237 test1238 test1239 test1240 test1241 test1242 test1243 \

test1236 test1237 test1238 test1239 test1240 test1241 test1242 test1243 \

test1244 test1245 test1246 test1247 test1248 test1249 test1250 test1251 \

test1244 test1245 test1246 test1247 test1248 test1249 test1250 test1251 \

test1252 test1253 test1254 test1255 test1256 test1257 \

\

\

test1280 test1281 test1282 \

test1280 test1281 test1282 \

\

\

tests/data/test1252

0 → 100644
+52 −0
Original line number Original line Diff line number Diff line 
<testcase>

<info>

<keywords>

HTTP

HTTP proxy

NO_PROXY

noproxy

</keywords>

</info>



# Server-side

<reply>

<data>

HTTP/1.1 200 OK

Date: Thu, 09 Nov 2010 14:49:00 GMT

Server: test-server/fake

Content-Length: 4

Content-Type: text/html



foo

</data>

</reply>



# Client-side

<client>

<server>

http

</server>

<name>

Under condition using --proxy, override NO_PROXY by --nproxy and access target URL directly

</name>

<setenv>

NO_PROXY=example.com

</setenv>

<command>

http://%HOSTIP:%HTTPPORT/1252 --proxy http://%HOSTIP:%HTTPPORT --noproxy %HOSTIP

</command>

</client>



# Verify data after the test has been "shot"

<verify>

<strip>

^User-Agent:.*

</strip>

<protocol>

GET /1252 HTTP/1.1

Host: %HOSTIP:%HTTPPORT

Accept: */*



</protocol>

</verify>

</testcase>