aboutsummaryrefslogtreecommitdiff
path: root/tests/data/Makefile.inc
diff options
context:
space:
mode:
authorERAMOTO Masaya <eramoto.masaya@jp.fujitsu.com>2016-12-19 16:27:24 +0900
committerDaniel Stenberg <daniel@haxx.se>2017-01-13 11:18:29 +0100
commit2ac1942c72fda6d2a1912fb4e8b6ebfc43ee9f30 (patch)
tree7b0bc441f7d466da9e142517a866f1f104b5f27f /tests/data/Makefile.inc
parentefdbfde7ca205f256c4e8b473c775cf73557cfd7 (diff)
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
Diffstat (limited to 'tests/data/Makefile.inc')
-rw-r--r--tests/data/Makefile.inc1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index afad1984d..471eb2510 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -128,6 +128,7 @@ 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 test1248 test1249 test1250 test1251 \
+test1252 test1253 test1254 test1255 test1256 test1257 \
\
test1280 test1281 test1282 \
\