diff --git a/lib/url.c b/lib/url.c
index 29beb38535..3cb7cba0e2 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) {
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index 9039851db1..afad1984d3 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -127,7 +127,7 @@ test1216 test1217 test1218 test1219 \
test1220 test1221 test1222 test1223 test1224 test1225 test1226 test1227 \
test1228 test1229 test1230 test1231 test1232 test1233 test1234 test1235 \
test1236 test1237 test1238 test1239 test1240 test1241 test1242 test1243 \
-test1244 test1245 test1246 test1247 \
+test1244 test1245 test1246 test1247 test1248 test1249 test1250 test1251 \
\
test1280 test1281 test1282 \
\
diff --git a/tests/data/test1248 b/tests/data/test1248
new file mode 100644
index 0000000000..28e7a8527b
--- /dev/null
+++ b/tests/data/test1248
@@ -0,0 +1,49 @@
+
+
+
+HTTP
+HTTP proxy
+noproxy
+
+
+
+# Server-side
+
+
+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
+
+
+
+# Client-side
+
+
+http
+
+
+Access a non-proxied host with using the combination of --proxy option and --noproxy option
+
+
+http://user:secret@%HOSTIP:%HTTPPORT/1248 --proxy http://dummy:%PROXYPORT/ --noproxy %HOSTIP --max-time 5
+
+
+
+# Verify data after the test has been "shot"
+
+
+^User-Agent:.*
+
+
+GET /1248 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic dXNlcjpzZWNyZXQ=
+Accept: */*
+
+
+
+
diff --git a/tests/data/test1249 b/tests/data/test1249
new file mode 100644
index 0000000000..ab56140686
--- /dev/null
+++ b/tests/data/test1249
@@ -0,0 +1,52 @@
+
+
+
+HTTP
+HTTP proxy
+NO_PROXY
+
+
+
+# Server-side
+
+
+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
+
+
+
+# Client-side
+
+
+http
+
+
+Access a non-proxied host with using the combination of --proxy option and NO_PROXY env var
+
+
+NO_PROXY=%HOSTIP
+
+
+http://user:secret@%HOSTIP:%HTTPPORT/1249 --proxy http://dummy:%PROXYPORT/ --max-time 5
+
+
+
+# Verify data after the test has been "shot"
+
+
+^User-Agent:.*
+
+
+GET /1249 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic dXNlcjpzZWNyZXQ=
+Accept: */*
+
+
+
+
diff --git a/tests/data/test1250 b/tests/data/test1250
new file mode 100644
index 0000000000..bf67b7fe7c
--- /dev/null
+++ b/tests/data/test1250
@@ -0,0 +1,53 @@
+
+
+
+HTTP
+HTTP proxy
+http_proxy
+noproxy
+
+
+
+# Server-side
+
+
+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
+
+
+
+# Client-side
+
+
+http
+
+
+Access a non-proxied host with using the combination of http_proxy env var and --noproxy option
+
+
+http_proxy=http://dummy:%PROXYPORT/
+
+
+http://user:secret@%HOSTIP:%HTTPPORT/1250 --noproxy %HOSTIP --max-time 5
+
+
+
+# Verify data after the test has been "shot"
+
+
+^User-Agent:.*
+
+
+GET /1250 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic dXNlcjpzZWNyZXQ=
+Accept: */*
+
+
+
+
diff --git a/tests/data/test1251 b/tests/data/test1251
new file mode 100644
index 0000000000..f37a685e8d
--- /dev/null
+++ b/tests/data/test1251
@@ -0,0 +1,54 @@
+
+
+
+HTTP
+HTTP proxy
+http_proxy
+NO_PROXY
+
+
+
+# Server-side
+
+
+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
+
+
+
+# Client-side
+
+
+http
+
+
+Access a non-proxied host with using the combination of http_proxy env var and NO_PROXY env var
+
+
+http_proxy=http://dummy:%PROXYPORT/
+NO_PROXY=%HOSTIP
+
+
+http://user:secret@%HOSTIP:%HTTPPORT/1251 --max-time 5
+
+
+
+# Verify data after the test has been "shot"
+
+
+^User-Agent:.*
+
+
+GET /1251 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic dXNlcjpzZWNyZXQ=
+Accept: */*
+
+
+
+