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

diff --git a/tests/data/test1141 b/tests/data/test1141
index b0ff038c48cbed85ff89ba4531d7b40b9ad56fe6..9c41d3935aef4bd96557f61c125a56c2bac9b56f 100644 (file)
--- 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\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
+Proxy-Connection: Keep-Alive\r
 \r
 GET http://foo.example.com/want/11410001 HTTP/1.1\r
 Host: foo.example.com\r
 Accept: */*\r
+Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test1142 b/tests/data/test1142
index 0ecfbd3c6f3a3f6c5c69821778e87e67acbd5d46..76c6bdf55c5e84978ecd2833151908990069f7b3 100644 (file)
--- 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\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
+Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 # 3, CURLE_URL_MALFORMAT for the four slashes

diff --git a/tests/data/test1244 b/tests/data/test1244
index 7912b4efeab9033214542b1497d1581f979bef1b..d0769ad85414a11e86843f29c4be035c69fd8581 100644 (file)
--- 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\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
+Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test2050 b/tests/data/test2050
index 805e872e44b69e8aeec7a88a16e22d093e1c841c..81ef79ffcc84042e668ad47130cab61a673751d7 100644 (file)
--- 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\r
 Host: connect.example.com.2050:%HTTPPORT\r
+Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>