From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 16 Aug 2016 08:14:48 +0000 (+0200)
Subject: proxy: fix tests as follow-up to 93b0d907d5
X-Git-Tag: curl-7_50_2~67
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa6b6f1a46298f6c8957f67673d6ab1a75052e0b;p=thirdparty%2Fcurl.git

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 b0ff038c48..9c41d3935a 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 0ecfbd3c6f..76c6bdf55c 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 7912b4efea..d0769ad854 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 805e872e44..81ef79ffcc 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>