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. --- tests/data/Makefile.inc | 2 +- tests/data/test1248 | 49 ++++++++++++++++++++++++++++++++++++++++++++ tests/data/test1249 | 52 +++++++++++++++++++++++++++++++++++++++++++++++ tests/data/test1250 | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/data/test1251 | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 209 insertions(+), 1 deletion(-) create mode 100644 tests/data/test1248 create mode 100644 tests/data/test1249 create mode 100644 tests/data/test1250 create mode 100644 tests/data/test1251 (limited to 'tests') diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index 9039851db..afad1984d 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 000000000..28e7a8527 --- /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 000000000..ab5614068 --- /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 000000000..bf67b7fe7 --- /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 000000000..f37a685e8 --- /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: */* + + + + -- cgit v1.2.3