aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-08-16 10:14:48 +0200
committerDaniel Stenberg <daniel@haxx.se>2016-08-16 10:15:26 +0200
commitfa6b6f1a46298f6c8957f67673d6ab1a75052e0b (patch)
treeead949c91e70d709644d50625f46808525b526dc
parent93b0d907d57453b481cd9aa15bd258942e4dd34e (diff)
proxy: fix tests as follow-up to 93b0d907d5
This fixes tests that were added after 113f04e664b as the tests would fail otherwise. We bring back "Proxy-Connection: Keep-Alive" now unconditionally to fix regressions with old and stupid proxies, but we could possibly switch to using it only for CONNECT or only for NTLM in a future if we want to gradually reduce it. Fixes #954 Reported-by: János Fekete
-rw-r--r--tests/data/test11412
-rw-r--r--tests/data/test11421
-rw-r--r--tests/data/test12441
-rw-r--r--tests/data/test20501
4 files changed, 5 insertions, 0 deletions
diff --git a/tests/data/test1141 b/tests/data/test1141
index b0ff038c4..9c41d3935 100644
--- a/tests/data/test1141
+++ b/tests/data/test1141
@@ -58,10 +58,12 @@ HTTP redirect to http:/// (three slashes!)
GET http://%HOSTIP:%HTTPPORT/want/1141 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
Accept: */*
+Proxy-Connection: Keep-Alive
GET http://foo.example.com/want/11410001 HTTP/1.1
Host: foo.example.com
Accept: */*
+Proxy-Connection: Keep-Alive
</protocol>
</verify>
diff --git a/tests/data/test1142 b/tests/data/test1142
index 0ecfbd3c6..76c6bdf55 100644
--- a/tests/data/test1142
+++ b/tests/data/test1142
@@ -53,6 +53,7 @@ HTTP redirect to http://// (four slashes!)
GET http://%HOSTIP:%HTTPPORT/want/1142 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
Accept: */*
+Proxy-Connection: Keep-Alive
</protocol>
# 3, CURLE_URL_MALFORMAT for the four slashes
diff --git a/tests/data/test1244 b/tests/data/test1244
index 7912b4efe..d0769ad85 100644
--- a/tests/data/test1244
+++ b/tests/data/test1244
@@ -54,6 +54,7 @@ http://%HOSTIP:%HTTPPORT/1244 -x %HOSTIP:%HTTPPORT --next http://%HOSTIP:%HTTPPO
GET http://%HOSTIP:%HTTPPORT/1244 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
Accept: */*
+Proxy-Connection: Keep-Alive
</protocol>
</verify>
diff --git a/tests/data/test2050 b/tests/data/test2050
index 805e872e4..81ef79ffc 100644
--- a/tests/data/test2050
+++ b/tests/data/test2050
@@ -64,6 +64,7 @@ http://www.example.com.2050/2050 --connect-to ::connect.example.com.2050:%HTTPPO
<proxy>
CONNECT connect.example.com.2050:%HTTPPORT HTTP/1.1
Host: connect.example.com.2050:%HTTPPORT
+Proxy-Connection: Keep-Alive
</proxy>
<protocol>