Revert "Proxy-Connection: stop sending this header by default"

This reverts commit 113f04e664b16b944e64498a73a4dab990fe9a68.
author: Daniel Stenberg <daniel@haxx.se> 2016-08-16 08:36:04 +0200
committer: Daniel Stenberg <daniel@haxx.se> 2016-08-16 08:36:04 +0200
commit: 93b0d907d57453b481cd9aa15bd258942e4dd34e (patch)
tree: 56b402c03f954d5a909391aef982f7cfabb7d76d
parent: 84e45f4b3ae49978cca282bf652d30c376518827 (diff)
download: curl-93b0d907d57453b481cd9aa15bd258942e4dd34e.tar.gz
102 files changed, 177 insertions, 4 deletions
diff --git a/lib/http.c b/lib/http.c
index 378d8f773..55d2a853a 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -2305,6 +2305,7 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
                      "%s" /* TE: */
                      "%s" /* accept-encoding */
                      "%s" /* referer */
+                     "%s" /* Proxy-Connection */
                      "%s",/* transfer-encoding */
 
                      ftp_typecode,
@@ -2327,6 +2328,10 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
                      conn->allocptr.accept_encoding:"",
                      (data->change.referer && conn->allocptr.ref)?
                      conn->allocptr.ref:"" /* Referer: <data> */,
+                     (conn->bits.httpproxy &&
+                      !conn->bits.tunnel_proxy &&
+                      !Curl_checkProxyheaders(conn, "Proxy-Connection:"))?
+                     "Proxy-Connection: Keep-Alive\r\n":"",
                      te
       );
 
diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index c6b05e30d..87f86b0c4 100644
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -160,6 +160,7 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn,
 
       if(!result) {
         char *host=(char *)"";
+        const char *proxyconn="";
         const char *useragent="";
         const char *http = (conn->proxytype == CURLPROXY_HTTP_1_0) ?
           "1.0" : "1.1";
@@ -185,6 +186,9 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn,
             return CURLE_OUT_OF_MEMORY;
           }
         }
+        if(!Curl_checkProxyheaders(conn, "Proxy-Connection:"))
+          proxyconn = "Proxy-Connection: Keep-Alive\r\n";
+
         if(!Curl_checkProxyheaders(conn, "User-Agent:") &&
            data->set.str[STRING_USERAGENT])
           useragent = conn->allocptr.uagent;
@@ -194,13 +198,15 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn,
                            "CONNECT %s HTTP/%s\r\n"
                            "%s"  /* Host: */
                            "%s"  /* Proxy-Authorization */
-                           "%s", /* User-Agent */
+                           "%s"  /* User-Agent */
+                           "%s", /* Proxy-Connection */
                            hostheader,
                            http,
                            host,
                            conn->allocptr.proxyuserpwd?
                            conn->allocptr.proxyuserpwd:"",
-                           useragent);
+                           useragent,
+                           proxyconn);
 
         if(host && *host)
           free(host);
diff --git a/tests/data/test1001 b/tests/data/test1001
index 60e68a894..91b13203e 100644
--- a/tests/data/test1001
+++ b/tests/data/test1001
@@ -89,6 +89,7 @@ Host: %HOSTIP:%HTTPPORT
 Content-Range: bytes 2-4/5
 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 0
 
 GET http://%HOSTIP:%HTTPPORT/1001 HTTP/1.1
@@ -96,6 +97,7 @@ Host: %HOSTIP:%HTTPPORT
 Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1001", response="6af4d89c952f4dd4cc215a6878dc499d"
 Content-Range: bytes 2-4/5
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 3
 Expect: 100-continue
 
diff --git a/tests/data/test1002 b/tests/data/test1002
index 83b87b9e4..83cce6e44 100644
--- a/tests/data/test1002
+++ b/tests/data/test1002
@@ -88,6 +88,7 @@ Host: %HOSTIP:%HTTPPORT
 Content-Range: bytes 2-4/5
 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 0
 
 GET http://%HOSTIP:%HTTPPORT/1002.upload1 HTTP/1.1
@@ -95,6 +96,7 @@ Host: %HOSTIP:%HTTPPORT
 Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1002.upload1", response="198aa9b6acb4b0c71d02a197a5e41f54"
 Content-Range: bytes 2-4/5
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 3
 Expect: 100-continue
 
@@ -105,6 +107,7 @@ Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", u
 Content-Range: bytes 2-4/5
 User-Agent: curl/7.16.1
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 3
 Expect: 100-continue
 
diff --git a/tests/data/test1008 b/tests/data/test1008
index 1dac3956f..bcc503e5a 100644
--- a/tests/data/test1008
+++ b/tests/data/test1008
@@ -114,10 +114,12 @@ chkhostname curlhost
 CONNECT test.remote.example.com.1008:%HTTPPORT HTTP/1.1
 Host: test.remote.example.com.1008:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Proxy-Connection: Keep-Alive
 
 CONNECT test.remote.example.com.1008:%HTTPPORT HTTP/1.1
 Host: test.remote.example.com.1008:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==
+Proxy-Connection: Keep-Alive
 
 GET /path/10080002 HTTP/1.1
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
diff --git a/tests/data/test1021 b/tests/data/test1021
index 3bd64bdd3..3ac9e12e6 100644
--- a/tests/data/test1021
+++ b/tests/data/test1021
@@ -119,14 +119,17 @@ chkhostname curlhost
 <protocol>
 CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1
 Host: test.remote.example.com.1021:%HTTPPORT
+Proxy-Connection: Keep-Alive
 
 CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1
 Host: test.remote.example.com.1021:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Proxy-Connection: Keep-Alive
 
 CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1
 Host: test.remote.example.com.1021:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==
+Proxy-Connection: Keep-Alive
 
 GET /path/10210002 HTTP/1.1
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
diff --git a/tests/data/test1034 b/tests/data/test1034
index f14268497..c47574051 100644
--- a/tests/data/test1034
+++ b/tests/data/test1034
@@ -55,6 +55,7 @@ http://invalid-utf8-�.local/page/1034 -x %HOSTIP:%HTTPPORT
 GET http://invalid-utf8-�.local/page/1034 HTTP/1.1
 Host: invalid-utf8-�.local
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test1035 b/tests/data/test1035
index e1c2af637..20b434c34 100644
--- a/tests/data/test1035
+++ b/tests/data/test1035
@@ -52,6 +52,7 @@ http://too-long-IDN-name-c�rl-r�les-la-la-la-dee-da-flooby-nooby.local/page/1035
 GET http://too-long-IDN-name-c�rl-r�les-la-la-la-dee-da-flooby-nooby.local/page/1035 HTTP/1.1
 Host: too-long-IDN-name-c�rl-r�les-la-la-la-dee-da-flooby-nooby.local
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test1059 b/tests/data/test1059
index ee4e6a78a..6820ea679 100644
--- a/tests/data/test1059
+++ b/tests/data/test1059
@@ -51,6 +51,7 @@ ftp://test-number:1059/wanted/page -p -x %HOSTIP:%HTTPPORT
 <protocol>
 CONNECT test-number:1059 HTTP/1.1
 Host: test-number:1059
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test1060 b/tests/data/test1060
index 1094792af..e4aea6589 100644
--- a/tests/data/test1060
+++ b/tests/data/test1060
@@ -887,10 +887,12 @@ http://test.remote.haxx.se.1060:8990/path/10600002 --proxy http://%HOSTIP:%HTTPP
 <protocol>
 CONNECT test.remote.haxx.se.1060:8990 HTTP/1.1
 Host: test.remote.haxx.se.1060:8990
+Proxy-Connection: Keep-Alive
 
 CONNECT test.remote.haxx.se.1060:8990 HTTP/1.1
 Host: test.remote.haxx.se.1060:8990
 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.1060:8990", response="e1fbed39c26f4efe284adc0e576ff638"
+Proxy-Connection: Keep-Alive
 
 GET /path/10600002 HTTP/1.1
 Host: test.remote.haxx.se.1060:8990
diff --git a/tests/data/test1061 b/tests/data/test1061
index 4f53a87a9..a55a27295 100644
--- a/tests/data/test1061
+++ b/tests/data/test1061
@@ -892,10 +892,12 @@ http://test.remote.haxx.se.1061:8990/path/10610002 --proxy http://%HOSTIP:%HTTPP
 <protocol>
 CONNECT test.remote.haxx.se.1061:8990 HTTP/1.1
 Host: test.remote.haxx.se.1061:8990
+Proxy-Connection: Keep-Alive
 
 CONNECT test.remote.haxx.se.1061:8990 HTTP/1.1
 Host: test.remote.haxx.se.1061:8990
 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.1061:8990", response="4e23449fa93224834299e7282a70472c"
+Proxy-Connection: Keep-Alive
 
 GET /path/10610002 HTTP/1.1
 Host: test.remote.haxx.se.1061:8990
diff --git a/tests/data/test1077 b/tests/data/test1077
index e71d75694..a3c90245a 100644
--- a/tests/data/test1077
+++ b/tests/data/test1077
@@ -30,6 +30,7 @@ Server: test-server/fake
 Content-Type: text/plain
 Content-Length: 9
 Funny-head: yesyes
+Proxy-Connection: Keep-Alive
 
 contents
 </data2>
@@ -62,10 +63,12 @@ FTP over HTTP proxy with downgrade to HTTP 1.0
 GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/1077 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/10770002 HTTP/1.0
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test1078 b/tests/data/test1078
index f04bad36f..a9bb771be 100644
--- a/tests/data/test1078
+++ b/tests/data/test1078
@@ -56,6 +56,7 @@ HTTP 1.0 CONNECT with proxytunnel and downgrade GET to HTTP/1.0
 <proxy>
 CONNECT %HOSTIP.1078:%HTTPPORT HTTP/1.0
 Host: %HOSTIP.1078:%HTTPPORT
+Proxy-Connection: Keep-Alive
 
 </proxy>
 <protocol>
diff --git a/tests/data/test1087 b/tests/data/test1087
index 1fb13cbef..d228976ac 100644
--- a/tests/data/test1087
+++ b/tests/data/test1087
@@ -92,15 +92,18 @@ http://first.host.it.is/we/want/that/page/10871000 -x %HOSTIP:%HTTPPORT --user i
 GET http://first.host.it.is/we/want/that/page/10871000 HTTP/1.1
 Host: first.host.it.is
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://first.host.it.is/we/want/that/page/10871000 HTTP/1.1
 Host: first.host.it.is
 Authorization: Basic aWFtOm15c2VsZg==
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://goto.second.host.now/10871002 HTTP/1.1
 Host: goto.second.host.now
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test1088 b/tests/data/test1088
index 9801fff14..a807ce9e5 100644
--- a/tests/data/test1088
+++ b/tests/data/test1088
@@ -93,16 +93,19 @@ http://first.host.it.is/we/want/that/page/10881000 -x %HOSTIP:%HTTPPORT --user i
 GET http://first.host.it.is/we/want/that/page/10881000 HTTP/1.1
 Host: first.host.it.is
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://first.host.it.is/we/want/that/page/10881000 HTTP/1.1
 Host: first.host.it.is
 Authorization: Basic aWFtOm15c2VsZg==
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://goto.second.host.now/10881002 HTTP/1.1
 Host: goto.second.host.now
 Authorization: Basic aWFtOm15c2VsZg==
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test1092 b/tests/data/test1092
index ce843f000..adef4320b 100644
--- a/tests/data/test1092
+++ b/tests/data/test1092
@@ -49,6 +49,7 @@ FTP with type=i over HTTP proxy
 GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/1092;type=i HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test1097 b/tests/data/test1097
index 81ea8552d..3b733a55a 100644
--- a/tests/data/test1097
+++ b/tests/data/test1097
@@ -67,6 +67,7 @@ CONNECT test.a.galaxy.far.far.away.1097:%HTTPPORT HTTP/1.1
 Host: test.a.galaxy.far.far.away.1097:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.19.5-CVS (i686-pc-linux-gnu) libcurl/7.19.5-CVS OpenSSL/0.9.8g zlib/1.2.3.3 c-ares/1.6.1-CVS libidn/1.12 libssh2/1.0.1_CVS
+Proxy-Connection: Keep-Alive
 
 POST /1097 HTTP/1.1
 User-Agent: curl/7.19.5-CVS (i686-pc-linux-gnu) libcurl/7.19.5-CVS OpenSSL/0.9.8g zlib/1.2.3.3 c-ares/1.6.1-CVS libidn/1.12 libssh2/1.0.1_CVS
diff --git a/tests/data/test1098 b/tests/data/test1098
index 70a6f3913..980564810 100644
--- a/tests/data/test1098
+++ b/tests/data/test1098
@@ -49,10 +49,12 @@ ftp://ftp-site/moo/1098 ftp://ftp-site/moo/1098 --proxy http://%HOSTIP:%HTTPPORT
 GET ftp://ftp-site/moo/1098 HTTP/1.1
 Host: ftp-site:21
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET ftp://ftp-site/moo/1098 HTTP/1.1
 Host: ftp-site:21
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 <stdout>
diff --git a/tests/data/test1104 b/tests/data/test1104
index 4df81a1a2..21efe3c15 100644
--- a/tests/data/test1104
+++ b/tests/data/test1104
@@ -72,10 +72,12 @@ http://%HOSTIP:%HTTPPORT/want/1104 -L -x %HOSTIP:%HTTPPORT -c log/cookies.jar
 GET http://%HOSTIP:%HTTPPORT/want/1104 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://%HOSTIP:%HTTPPORT/want/data/11040002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
+Proxy-Connection: Keep-Alive
 Cookie: test2=true
 
 </protocol>
diff --git a/tests/data/test1106 b/tests/data/test1106
index a2adbbb3f..0c6bec177 100644
--- a/tests/data/test1106
+++ b/tests/data/test1106
@@ -50,6 +50,7 @@ ftp://%HOSTIP:23456/1106
 GET ftp://%HOSTIP:23456/1106 HTTP/1.1
 Host: %HOSTIP:23456
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test1213 b/tests/data/test1213
index bc146b016..4f22f0d92 100644
--- a/tests/data/test1213
+++ b/tests/data/test1213
@@ -46,6 +46,7 @@ HTTP with proxy and host-only URL
 GET http://we.want.that.site.com.1213/ HTTP/1.1
 Host: we.want.that.site.com.1213
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test1214 b/tests/data/test1214
index e703f7a91..3eeb3e3ad 100644
--- a/tests/data/test1214
+++ b/tests/data/test1214
@@ -46,6 +46,7 @@ HTTP with proxy and URL with ? and no slash separator
 GET http://we.want.that.site.com.1214/?moo=foo HTTP/1.1
 Host: we.want.that.site.com.1214
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test1215 b/tests/data/test1215
index e22591c90..f8c52a9a1 100644
--- a/tests/data/test1215
+++ b/tests/data/test1215
@@ -92,12 +92,14 @@ Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.30.0-DEV
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://%HOSTIP:%HTTPPORT/1215 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==
 User-Agent: curl/7.30.0-DEV
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test1216 b/tests/data/test1216
index 6e45ac6a3..5beda797d 100644
--- a/tests/data/test1216
+++ b/tests/data/test1216
@@ -50,11 +50,13 @@ example.fake	TRUE	/c	FALSE	2139150993	moo3	indeed
 GET http://example.fake/c/1216 HTTP/1.1
 Host: example.fake
 Accept: */*
+Proxy-Connection: Keep-Alive
 Cookie: moo2=indeed; moo3=indeed
 
 GET http://bexample.fake/c/1216 HTTP/1.1
 Host: bexample.fake
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test1218 b/tests/data/test1218
index 9c2fc0389..e3f1f6d04 100644
--- a/tests/data/test1218
+++ b/tests/data/test1218
@@ -43,15 +43,18 @@ http://example.fake/c/1218 http://example.fake/c/1218 http://bexample.fake/c/121
 GET http://example.fake/c/1218 HTTP/1.1
 Host: example.fake
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://example.fake/c/1218 HTTP/1.1
 Host: example.fake
 Accept: */*
+Proxy-Connection: Keep-Alive
 Cookie: bug=fixed
 
 GET http://bexample.fake/c/1218 HTTP/1.1
 Host: bexample.fake
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test1228 b/tests/data/test1228
index d0af517de..a7e56a797 100644
--- a/tests/data/test1228
+++ b/tests/data/test1228
@@ -42,10 +42,12 @@ http://example.fake/hoge/1228 http://example.fake/hogege/ -b nonexisting -x %HOS
 GET http://example.fake/hoge/1228 HTTP/1.1
 Host: example.fake
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://example.fake/hogege/ HTTP/1.1
 Host: example.fake
 Accept: */*
+Proxy-Connection: Keep-Alive
 Cookie: path1=root
 
 </protocol>
diff --git a/tests/data/test1230 b/tests/data/test1230
index 8ce4c4ee6..3c1d3d448 100644
--- a/tests/data/test1230
+++ b/tests/data/test1230
@@ -69,6 +69,7 @@ http://[1234:1234:1234::4ce]:%HTTPPORT/wanted/page/1230 -p -x %HOSTIP:%HTTPPORT
 <protocol>
 CONNECT [1234:1234:1234::4ce]:%HTTPPORT HTTP/1.1
 Host: [1234:1234:1234::4ce]:%HTTPPORT
+Proxy-Connection: Keep-Alive
 
 GET /wanted/page/1230 HTTP/1.1
 Host: [1234:1234:1234::4ce]:%HTTPPORT
diff --git a/tests/data/test1232 b/tests/data/test1232
index 1c5bc2031..ead43365f 100644
--- a/tests/data/test1232
+++ b/tests/data/test1232
@@ -53,10 +53,12 @@ HTTP URL with dotdot removal from path using an HTTP proxy
 GET http://test.remote.haxx.se.1232:8990/hej/but/1232?stupid=me/../1232 HTTP/1.1
 Host: test.remote.haxx.se.1232:8990
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://test.remote.haxx.se.1232:8990/hej/but/12320001 HTTP/1.1
 Host: test.remote.haxx.se.1232:8990
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test1241 b/tests/data/test1241
index 5a127326d..aaa568868 100644
--- a/tests/data/test1241
+++ b/tests/data/test1241
@@ -52,10 +52,12 @@ HTTP _without_ dotdot removal
 GET http://test.remote.haxx.se.1241:8990/../../hej/but/who/../1241?stupid=me/../1241 HTTP/1.1
 Host: test.remote.haxx.se.1241:8990
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://test.remote.haxx.se.1241:8990/../../hej/but/who/../12410001 HTTP/1.1
 Host: test.remote.haxx.se.1241:8990
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test1314 b/tests/data/test1314
index 11e128a85..078ada64a 100644
--- a/tests/data/test1314
+++ b/tests/data/test1314
@@ -67,10 +67,12 @@ http://firstplace.example.com/want/1314 -L -x http://%HOSTIP:%HTTPPORT
 GET http://firstplace.example.com/want/1314 HTTP/1.1
 Host: firstplace.example.com
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://somewhere.example.com/reply/1314 HTTP/1.1
 Host: somewhere.example.com
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test1319 b/tests/data/test1319
index a97da9c41..0520b1b32 100644
--- a/tests/data/test1319
+++ b/tests/data/test1319
@@ -79,6 +79,7 @@ QUIT
 CONNECT pop.1319:%POP3PORT HTTP/1.1
 Host: pop.1319:%POP3PORT
 User-Agent: curl/7.24.0-DEV (i686-pc-linux-gnu) libcurl/7.24.0-DEV OpenSSL/1.0.0e zlib/1.2.3.4 c-ares/1.7.6-DEV libidn/1.23 libssh2/1.4.0_DEV librtmp/2.2e
+Proxy-Connection: Keep-Alive
 
 </proxy>
 </verify>
diff --git a/tests/data/test1320 b/tests/data/test1320
index 609f4c2f7..7a15f8091 100644
--- a/tests/data/test1320
+++ b/tests/data/test1320
@@ -66,6 +66,7 @@ body
 CONNECT smtp.1320:%SMTPPORT HTTP/1.1
 Host: smtp.1320:%SMTPPORT
 User-Agent: curl/7.24.0-DEV (i686-pc-linux-gnu) libcurl/7.24.0-DEV OpenSSL/1.0.0e zlib/1.2.3.4 c-ares/1.7.6-DEV libidn/1.23 libssh2/1.4.0_DEV librtmp/2.2e
+Proxy-Connection: Keep-Alive
 
 </proxy>
 </verify>
diff --git a/tests/data/test1321 b/tests/data/test1321
index b5ad277b0..266fd8828 100644
--- a/tests/data/test1321
+++ b/tests/data/test1321
@@ -75,6 +75,7 @@ A005 LOGOUT
 CONNECT imap.1321:%IMAPPORT HTTP/1.1
 Host: imap.1321:%IMAPPORT
 User-Agent: curl/7.24.0-DEV (i686-pc-linux-gnu) libcurl/7.24.0-DEV OpenSSL/1.0.0e zlib/1.2.3.4 c-ares/1.7.6-DEV libidn/1.23 libssh2/1.4.0_DEV librtmp/2.2e
+Proxy-Connection: Keep-Alive
 
 </proxy>
 </verify>
diff --git a/tests/data/test1331 b/tests/data/test1331
index 837ef8dd7..3299df469 100644
--- a/tests/data/test1331
+++ b/tests/data/test1331
@@ -75,11 +75,13 @@ HTTP --proxy-anyauth and 407 with cookies
 GET http://z.x.com/1331 HTTP/1.1
 Host: z.x.com
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://z.x.com/1331 HTTP/1.1
 Host: z.x.com
 Proxy-Authorization: Basic bXluYW1lOm15cGFzc3dvcmQ=
 Accept: */*
+Proxy-Connection: Keep-Alive
 Cookie: proxycookie=weirdo
 
 </protocol>
diff --git a/tests/data/test1415 b/tests/data/test1415
index 37cfb073b..560440407 100644
--- a/tests/data/test1415
+++ b/tests/data/test1415
@@ -57,6 +57,7 @@ http://example.com/we/want/1415 -b none -c log/jar1415.txt -x %HOSTIP:%HTTPPORT
 GET http://example.com/we/want/1415 HTTP/1.1
 Host: example.com
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 
diff --git a/tests/data/test1421 b/tests/data/test1421
index 889c938db..6c59b2160 100644
--- a/tests/data/test1421
+++ b/tests/data/test1421
@@ -59,10 +59,12 @@ Content-Length: 6
 GET http://test.remote.haxx.se.1421:8990/ HTTP/1.1
 Host: test.remote.haxx.se.1421:8990
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://different.remote.haxx.se.1421:8990/ HTTP/1.1
 Host: different.remote.haxx.se.1421:8990
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 [DISCONNECT]
 </protocol>
diff --git a/tests/data/test1428 b/tests/data/test1428
index 60fb8a93e..59041ec96 100644
--- a/tests/data/test1428
+++ b/tests/data/test1428
@@ -64,6 +64,7 @@ http://test.1428:%HTTPPORT/we/want/that/page/1428 -p -x %HOSTIP:%PROXYPORT --use
 CONNECT test.1428:%HTTPPORT HTTP/1.1
 Host: test.1428:%HTTPPORT
 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
+Proxy-Connection: Keep-Alive
 header-type: proxy
 
 </proxy>
diff --git a/tests/data/test1509 b/tests/data/test1509
index 18eb07f1e..b4bfc6603 100644
--- a/tests/data/test1509
+++ b/tests/data/test1509
@@ -74,6 +74,7 @@ moo
 <proxy>
 CONNECT the.old.moo.1509:%HTTPPORT HTTP/1.1
 Host: the.old.moo.1509:%HTTPPORT
+Proxy-Connection: Keep-Alive
 
 </proxy>
 <protocol>
diff --git a/tests/data/test1525 b/tests/data/test1525
index d8f68838d..0560d5c1a 100644
--- a/tests/data/test1525
+++ b/tests/data/test1525
@@ -58,6 +58,7 @@ CURLOPT_PROXYHEADER is ignored CURLHEADER_UNIFIED
 <proxy>
 CONNECT the.old.moo.1525:%HTTPPORT HTTP/1.1
 Host: the.old.moo.1525:%HTTPPORT
+Proxy-Connection: Keep-Alive
 User-Agent: Http Agent
 
 </proxy>
diff --git a/tests/data/test1526 b/tests/data/test1526
index 9f5d09e6d..aa111c890 100644
--- a/tests/data/test1526
+++ b/tests/data/test1526
@@ -58,6 +58,7 @@ CURLOPT_PROXYHEADER: separate host/proxy headers
 <proxy>
 CONNECT the.old.moo.1526:%HTTPPORT HTTP/1.1
 Host: the.old.moo.1526:%HTTPPORT
+Proxy-Connection: Keep-Alive
 User-Agent: Proxy Agent
 
 </proxy>
diff --git a/tests/data/test1527 b/tests/data/test1527
index 69ae6e4a0..e8d52794b 100644
--- a/tests/data/test1527
+++ b/tests/data/test1527
@@ -57,6 +57,7 @@ Check same headers are generated with CURLOPT_HEADEROPT == CURLHEADER_UNIFIED
 <proxy>
 CONNECT the.old.moo.1527:%HTTPPORT HTTP/1.1
 Host: the.old.moo.1527:%HTTPPORT
+Proxy-Connection: Keep-Alive
 User-Agent: Http Agent
 Expect: 100-continue
 
diff --git a/tests/data/test1528 b/tests/data/test1528
index e60f60026..876806af4 100644
--- a/tests/data/test1528
+++ b/tests/data/test1528
@@ -51,6 +51,7 @@ Separately specified proxy/server headers sent in a proxy GET
 GET http://the.old.moo:%HTTPPORT/1528 HTTP/1.1
 Host: the.old.moo:%HTTPPORT
 Accept: */*
+Proxy-Connection: Keep-Alive
 User-Agent: Http Agent
 Proxy-User-Agent: Http Agent2
 
diff --git a/tests/data/test16 b/tests/data/test16
index 9d9a9cc1c..15f4c7a7b 100644
--- a/tests/data/test16
+++ b/tests/data/test16
@@ -45,6 +45,7 @@ GET http://we.want.that.site.com/16 HTTP/1.1
 Host: we.want.that.site.com
 Proxy-Authorization: Basic ZmFrZUB1c2VyOmxvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29uZw==
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test162 b/tests/data/test162
index cc4c82d45..ee2f40aa7 100644
--- a/tests/data/test162
+++ b/tests/data/test162
@@ -51,6 +51,7 @@ Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 <errorcode>
diff --git a/tests/data/test165 b/tests/data/test165
index b475fdef1..ddfe1e9dc 100644
--- a/tests/data/test165
+++ b/tests/data/test165
@@ -51,6 +51,7 @@ http://www.���.se/page/165 -x %HOSTIP:%HTTPPORT
 GET http://www.xn--4cab6c.se/page/165 HTTP/1.1
 Host: www.xn--4cab6c.se
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test167 b/tests/data/test167
index 76f9e5c7f..0b14996a3 100644
--- a/tests/data/test167
+++ b/tests/data/test167
@@ -65,6 +65,7 @@ Host: data.from.server.requiring.digest.hohoho.com
 Proxy-Authorization: Basic Zm9vOmJhcg==
 User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://data.from.server.requiring.digest.hohoho.com/167 HTTP/1.1
 Host: data.from.server.requiring.digest.hohoho.com
@@ -72,6 +73,7 @@ Proxy-Authorization: Basic Zm9vOmJhcg==
 Authorization: Digest username="digest", realm="weirdorealm", nonce="12345", uri="/167", response="13c7c02a252cbe1c46d8669898a3be26"
 User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test168 b/tests/data/test168
index 0f4e02573..20e0b6d9c 100644
--- a/tests/data/test168
+++ b/tests/data/test168
@@ -78,12 +78,14 @@ GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1
 Host: data.from.server.requiring.digest.hohoho.com
 User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1
 Host: data.from.server.requiring.digest.hohoho.com
 Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/168", response="fb8608e00ad9239a3dedb14bc8575976"
 User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1
 Host: data.from.server.requiring.digest.hohoho.com
@@ -91,6 +93,7 @@ Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345",
 Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/168", response="ca87f2d768a231e2d637a55698d5c416"
 User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.3
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test169 b/tests/data/test169
index be5b4c6d9..73ca9bd20 100644
--- a/tests/data/test169
+++ b/tests/data/test169
@@ -108,18 +108,21 @@ Host: data.from.server.requiring.digest.hohoho.com
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.3
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1
 Host: data.from.server.requiring.digest.hohoho.com
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==
 User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.3
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1
 Host: data.from.server.requiring.digest.hohoho.com
 Authorization: Digest username="digest", realm="r e a l m", nonce="abcdef", uri="/169", response="95d48591985a03c4b49cb962aa7bd3e6"
 User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.3
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test170 b/tests/data/test170
index 48a263f46..8ce7774f9 100644
--- a/tests/data/test170
+++ b/tests/data/test170
@@ -40,6 +40,7 @@ Host: a.galaxy.far.far.away
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 libidn/0.4.3
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 0
 
 </protocol>
diff --git a/tests/data/test171 b/tests/data/test171
index 3b9f7ba8c..09e48b70a 100644
--- a/tests/data/test171
+++ b/tests/data/test171
@@ -44,6 +44,7 @@ HTTP, get cookie with dot prefixed full domain
 GET http://z.x.com/171 HTTP/1.1
 Host: z.x.com
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 <file name="log/jar171" mode="text">
diff --git a/tests/data/test179 b/tests/data/test179
index 1cd5badf1..f8f7811a7 100644
--- a/tests/data/test179
+++ b/tests/data/test179
@@ -49,6 +49,7 @@ supertrooper.fake	FALSE	/c	FALSE	2139150993	moo2	indeed
 GET http://supertrooper.fake/c/179 HTTP/1.1
 Host: supertrooper.fake
 Accept: */*
+Proxy-Connection: Keep-Alive
 Cookie: moo2=indeed
 
 </protocol>
diff --git a/tests/data/test183 b/tests/data/test183
index b44710998..f34dc0c98 100644
--- a/tests/data/test183
+++ b/tests/data/test183
@@ -42,11 +42,13 @@ GET http://deathstar.another.galaxy/183 HTTP/1.1
 User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.6b zlib/1.1.4 libidn/0.4.6
 Host: deathstar.another.galaxy
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://a.galaxy.far.far.away/183 HTTP/1.1
 User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.6b zlib/1.1.4 libidn/0.4.6
 Host: a.galaxy.far.far.away
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 
diff --git a/tests/data/test184 b/tests/data/test184
index 9cadc8290..8b09dde28 100644
--- a/tests/data/test184
+++ b/tests/data/test184
@@ -62,10 +62,12 @@ GET http://deathstar.another.galaxy/184 HTTP/1.1
 Host: another.visitor.stay.a.while.stay.foreeeeeever
 User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.6b zlib/1.1.4 libidn/0.4.6
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://yet.another.host/184 HTTP/1.1
 Host: yet.another.host
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 
diff --git a/tests/data/test185 b/tests/data/test185
index dbef6e7ea..298dd49ce 100644
--- a/tests/data/test185
+++ b/tests/data/test185
@@ -62,10 +62,12 @@ GET http://deathstar.another.galaxy/185 HTTP/1.1
 Host: another.visitor.stay.a.while.stay.foreeeeeever
 User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.6b zlib/1.1.4 libidn/0.4.6
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://deathstar.another.galaxy/go/west/185 HTTP/1.1
 Host: another.visitor.stay.a.while.stay.foreeeeeever
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 
diff --git a/tests/data/test2047 b/tests/data/test2047
index a8cca2f40..442297801 100644
--- a/tests/data/test2047
+++ b/tests/data/test2047
@@ -63,10 +63,12 @@ http://åäö.se/2047 -x %HOSTIP:%HTTPPORT -w "%{num_connects}\n%{num_redirects}
 GET http://xn--4cab6c.se/2047 HTTP/1.1
 Host: xn--4cab6c.se
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://xn--4cab6c.se/20470001 HTTP/1.1
 Host: xn--4cab6c.se
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 
diff --git a/tests/data/test206 b/tests/data/test206
index efbc56e0c..5f0c88562 100644
--- a/tests/data/test206
+++ b/tests/data/test206
@@ -90,10 +90,12 @@ http://test.remote.haxx.se.206:8990/path/2060002 --proxy http://%HOSTIP:%HTTPPOR
 <protocol>
 CONNECT test.remote.haxx.se.206:8990 HTTP/1.1
 Host: test.remote.haxx.se.206:8990
+Proxy-Connection: Keep-Alive
 
 CONNECT test.remote.haxx.se.206:8990 HTTP/1.1
 Host: test.remote.haxx.se.206:8990
 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.206:8990", response="003e36decb4dbf6366b3ecb9b87c24ec"
+Proxy-Connection: Keep-Alive
 
 GET /path/2060002 HTTP/1.1
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
diff --git a/tests/data/test208 b/tests/data/test208
index fb4c0ea13..afb2566b5 100644
--- a/tests/data/test208
+++ b/tests/data/test208
@@ -57,6 +57,7 @@ PUT ftp://daniel:mysecret@host.com/we/want/208 HTTP/1.1
 Host: host.com:21
 Authorization: Basic ZGFuaWVsOm15c2VjcmV0
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 78
 Expect: 100-continue
 
diff --git a/tests/data/test209 b/tests/data/test209
index f868541c6..961eba1a2 100644
--- a/tests/data/test209
+++ b/tests/data/test209
@@ -104,10 +104,12 @@ chkhostname curlhost
 CONNECT test.remote.example.com.209:%HTTPPORT HTTP/1.1
 Host: test.remote.example.com.209:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Proxy-Connection: Keep-Alive
 
 CONNECT test.remote.example.com.209:%HTTPPORT HTTP/1.1
 Host: test.remote.example.com.209:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==
+Proxy-Connection: Keep-Alive
 
 GET /path/2090002 HTTP/1.1
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
diff --git a/tests/data/test213 b/tests/data/test213
index 7ceed9849..edbb6a6f3 100644
--- a/tests/data/test213
+++ b/tests/data/test213
@@ -104,10 +104,12 @@ chkhostname curlhost
 CONNECT test.remote.example.com.213:%HTTPPORT HTTP/1.0
 Host: test.remote.example.com.213:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Proxy-Connection: Keep-Alive
 
 CONNECT test.remote.example.com.213:%HTTPPORT HTTP/1.0
 Host: test.remote.example.com.213:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==
+Proxy-Connection: Keep-Alive
 
 POST /path/2130002 HTTP/1.1
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
diff --git a/tests/data/test217 b/tests/data/test217
index 0e0c0add1..f10df566b 100644
--- a/tests/data/test217
+++ b/tests/data/test217
@@ -44,6 +44,7 @@ http://test.remote.example.com.217:%HTTPPORT/path/2170002 --proxy http://%HOSTIP
 <protocol>
 CONNECT test.remote.example.com.217:%HTTPPORT HTTP/1.1
 Host: test.remote.example.com.217:%HTTPPORT
+Proxy-Connection: Keep-Alive
 
 </protocol>
 # CURLE_RECV_ERROR
diff --git a/tests/data/test233 b/tests/data/test233
index 996855d59..b631e52cf 100644
--- a/tests/data/test233
+++ b/tests/data/test233
@@ -81,11 +81,13 @@ Host: first.host.it.is
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz
 Authorization: Basic aWFtOm15c2VsZg==
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://goto.second.host.now/2330002 HTTP/1.1
 Host: goto.second.host.now
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test234 b/tests/data/test234
index f7da2b95e..1d2e05b39 100644
--- a/tests/data/test234
+++ b/tests/data/test234
@@ -83,12 +83,14 @@ Host: first.host.it.is
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz
 Authorization: Basic aWFtOm15c2VsZg==
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://goto.second.host.now/2340002 HTTP/1.1
 Host: goto.second.host.now
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz
 Authorization: Basic aWFtOm15c2VsZg==
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test239 b/tests/data/test239
index 275c81b3c..6b92f07f7 100644
--- a/tests/data/test239
+++ b/tests/data/test239
@@ -83,6 +83,7 @@ Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
@@ -91,6 +92,7 @@ Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 6
 Content-Type: application/x-www-form-urlencoded
 
diff --git a/tests/data/test243 b/tests/data/test243
index bc09286ee..3496055d1 100644
--- a/tests/data/test243
+++ b/tests/data/test243
@@ -103,6 +103,7 @@ POST http://%HOSTIP:%HTTPPORT/243 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 6
 Content-Type: application/x-www-form-urlencoded
 
@@ -111,6 +112,7 @@ Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
@@ -119,6 +121,7 @@ Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 6
 Content-Type: application/x-www-form-urlencoded
 
diff --git a/tests/data/test256 b/tests/data/test256
index 0acd9db12..2b96ecf3d 100644
--- a/tests/data/test256
+++ b/tests/data/test256
@@ -51,6 +51,7 @@ Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: Basic ZGFuaWVsOnN0ZW5iZXJn
 Range: bytes=78-
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 
diff --git a/tests/data/test257 b/tests/data/test257
index 45dcbd556..502448ddb 100644
--- a/tests/data/test257
+++ b/tests/data/test257
@@ -92,17 +92,20 @@ Host: supersite.com
 Authorization: Basic dXNlcjE6cGFzc3dkMQ==
 User-Agent: curl/7.14.0-CVS (i686-pc-linux-gnu) libcurl/7.14.0-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://anotherone.com/2570002 HTTP/1.1
 Host: anotherone.com
 Authorization: Basic dXNlcjI6cGFzc3dkMg==
 User-Agent: curl/7.14.0-CVS (i686-pc-linux-gnu) libcurl/7.14.0-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://athird.com/2570003 HTTP/1.1
 Host: athird.com
 User-Agent: curl/7.14.0-CVS (i686-pc-linux-gnu) libcurl/7.14.0-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test258 b/tests/data/test258
index 82c6731cc..98c340141 100644
--- a/tests/data/test258
+++ b/tests/data/test258
@@ -20,6 +20,7 @@ HTTP/1.1 407 no, tell me who you are first swsclose
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Proxy-Authenticate: Digest realm="many secrets", nonce="911"
+Proxy-Connection: close
 Content-Length: 0
 
 </data>
@@ -36,6 +37,7 @@ HTTP/1.1 407 no, tell me who you are first swsclose
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Proxy-Authenticate: Digest realm="many secrets", nonce="911"
+Proxy-Connection: close
 Content-Length: 0
 
 HTTP/1.1 200 A OK
@@ -81,6 +83,7 @@ POST http://remotehost:54321/we/want/258 HTTP/1.1
 Host: remotehost:54321
 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 409
 Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce
 
@@ -106,6 +109,7 @@ Host: remotehost:54321
 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/258", response="2501654ca391f0b5c8c12a1da77e34cd"
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 409
 Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce
 
diff --git a/tests/data/test259 b/tests/data/test259
index 75b1f531c..9532887a9 100644
--- a/tests/data/test259
+++ b/tests/data/test259
@@ -79,6 +79,7 @@ POST http://remotehost:54321/we/want/259 HTTP/1.1
 Host: remotehost:54321
 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 409
 Expect: 100-continue
 Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce
@@ -105,6 +106,7 @@ Host: remotehost:54321
 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/259", response="b479994d13e60f3aa192a67c5892ddc5"
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 409
 Expect: 100-continue
 Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce
diff --git a/tests/data/test263 b/tests/data/test263
index df0ba032f..5088141f5 100644
--- a/tests/data/test263
+++ b/tests/data/test263
@@ -47,6 +47,7 @@ HTTP-IPv6 GET with proxy specified using IPv6-numerical address
 GET http://veryveryremotesite.com/263 HTTP/1.1
 Host: veryveryremotesite.com
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test264 b/tests/data/test264
index 1174ca54d..f4d171a16 100644
--- a/tests/data/test264
+++ b/tests/data/test264
@@ -42,6 +42,7 @@ GET http://we.want.that.site.com/264 HTTP/1.1
 Host: we.want.that.site.com
 Proxy-Authorization: Basic ZmFrZTp1c2Vy
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test265 b/tests/data/test265
index 79ab183f0..1a162b808 100644
--- a/tests/data/test265
+++ b/tests/data/test265
@@ -107,10 +107,12 @@ chkhostname curlhost
 CONNECT test.remote.example.com.265:%HTTPPORT HTTP/1.1
 Host: test.remote.example.com.265:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+Proxy-Connection: Keep-Alive
 
 CONNECT test.remote.example.com.265:%HTTPPORT HTTP/1.1
 Host: test.remote.example.com.265:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==
+Proxy-Connection: Keep-Alive
 
 POST /path/2650002 HTTP/1.1
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
diff --git a/tests/data/test275 b/tests/data/test275
index 600045482..802c4bbcc 100644
--- a/tests/data/test275
+++ b/tests/data/test275
@@ -69,6 +69,7 @@ CONNECT remotesite.com.275:%HTTPPORT HTTP/1.1
 Host: remotesite.com.275:%HTTPPORT
 Proxy-Authorization: Basic eW91YXJlOnlvdXJzZWxm
 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
+Proxy-Connection: Keep-Alive
 
 </proxy>
 <protocol>
diff --git a/tests/data/test278 b/tests/data/test278
index e6f1ef705..3112264a3 100644
--- a/tests/data/test278
+++ b/tests/data/test278
@@ -42,6 +42,7 @@ GET http://we.want.that.site.com/278 HTTP/1.1
 Host: we.want.that.site.com
 Proxy-Authorization: Basic ZmFrZTo=
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test279 b/tests/data/test279
index 5005daa5a..47f8b687e 100644
--- a/tests/data/test279
+++ b/tests/data/test279
@@ -43,6 +43,7 @@ GET http://we.want.that.site.com/279 HTTP/1.1
 Host: we.want.that.site.com
 Proxy-Authorization: Basic ZmFrZTo=
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test287 b/tests/data/test287
index 526446f40..6772e220f 100644
--- a/tests/data/test287
+++ b/tests/data/test287
@@ -37,6 +37,7 @@ http://test.remote.example.com.287:%HTTPPORT/path/287 -H "User-Agent: looser/201
 <protocol>
 CONNECT test.remote.example.com.287:%HTTPPORT HTTP/1.1
 Host: test.remote.example.com.287:%HTTPPORT
+Proxy-Connection: Keep-Alive
 User-Agent: looser/2007
 
 </protocol>
diff --git a/tests/data/test299 b/tests/data/test299
index a7b775569..4daaea47d 100644
--- a/tests/data/test299
+++ b/tests/data/test299
@@ -46,6 +46,7 @@ GET ftp://michal:aybabtu@host.com/we/want/299 HTTP/1.1
 Host: host.com:21
 Authorization: Basic bWljaGFsOmF5YmFidHU=
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test43 b/tests/data/test43
index dc0dd5fcd..e5535bb3a 100644
--- a/tests/data/test43
+++ b/tests/data/test43
@@ -67,10 +67,12 @@ http://%HOSTIP:%HTTPPORT/want/43 -L -x %HOSTIP:%HTTPPORT
 GET http://%HOSTIP:%HTTPPORT/want/43 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://%HOSTIP:%HTTPPORT/want/data/430002.txt?coolsite=yes HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test5 b/tests/data/test5
index 13314570b..b62f1a127 100644
--- a/tests/data/test5
+++ b/tests/data/test5
@@ -43,6 +43,7 @@ http://%HOSTIP:%HTTPPORT/we/want/that/page/5#5 -x %HOSTIP:%HTTPPORT
 GET http://%HOSTIP:%HTTPPORT/we/want/that/page/5 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test503 b/tests/data/test503
index f02bac6f3..e8dc21e8d 100644
--- a/tests/data/test503
+++ b/tests/data/test503
@@ -72,6 +72,7 @@ moo
 CONNECT machine.503:%HTTPPORT HTTP/1.1
 Host: machine.503:%HTTPPORT
 Proxy-Authorization: Basic dGVzdDppbmc=
+Proxy-Connection: Keep-Alive
 
 </proxy>
 <protocol>
diff --git a/tests/data/test523 b/tests/data/test523
index d021ae3be..9abe0ed22 100644
--- a/tests/data/test523
+++ b/tests/data/test523
@@ -54,6 +54,7 @@ GET HTTP://www.example.com:19999/523 HTTP/1.1
 Host: www.example.com:19999
 Authorization: Basic eHh4Onl5eQ==
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 <stdout>
diff --git a/tests/data/test540 b/tests/data/test540
index 19a13f19e..8decaea9d 100644
--- a/tests/data/test540
+++ b/tests/data/test540
@@ -78,16 +78,19 @@ http://test.remote.example.com/path/540 http://%HOSTIP:%HTTPPORT silly:person cu
 GET http://test.remote.example.com/path/540 HTTP/1.1
 Host: custom.set.host.name
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://test.remote.example.com/path/540 HTTP/1.1
 Host: custom.set.host.name
 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/540", response="ca507dcf189196b6a5374d3233042261"
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://test.remote.example.com/path/540 HTTP/1.1
 Host: custom.set.host.name
 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/540", response="ca507dcf189196b6a5374d3233042261"
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test547 b/tests/data/test547
index 7cf3e9197..cee22c6f7 100644
--- a/tests/data/test547
+++ b/tests/data/test547
@@ -106,6 +106,7 @@ POST http://test.remote.example.com/path/547 HTTP/1.1
 Host: test.remote.example.com
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 36
 Content-Type: application/x-www-form-urlencoded
 
@@ -115,6 +116,7 @@ Host: test.remote.example.com
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
@@ -123,6 +125,7 @@ Host: test.remote.example.com
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 36
 Content-Type: application/x-www-form-urlencoded
 
diff --git a/tests/data/test548 b/tests/data/test548
index e9d2262bb..34cf5e2ea 100644
--- a/tests/data/test548
+++ b/tests/data/test548
@@ -106,6 +106,7 @@ POST http://test.remote.example.com/path/548 HTTP/1.1
 Host: test.remote.example.com
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 36
 Content-Type: application/x-www-form-urlencoded
 
@@ -115,6 +116,7 @@ Host: test.remote.example.com
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
@@ -123,6 +125,7 @@ Host: test.remote.example.com
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 36
 Content-Type: application/x-www-form-urlencoded
 
diff --git a/tests/data/test549 b/tests/data/test549
index 59925ce79..a248edbf6 100644
--- a/tests/data/test549
+++ b/tests/data/test549
@@ -55,6 +55,7 @@ ftp://www.example.com/moo/549 http://%HOSTIP:%HTTPPORT
 GET ftp://www.example.com/moo/549;type=i HTTP/1.1
 Host: www.example.com:21
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 <stdout>
diff --git a/tests/data/test550 b/tests/data/test550
index 9a717ee87..a609aa216 100644
--- a/tests/data/test550
+++ b/tests/data/test550
@@ -55,6 +55,7 @@ ftp://www.example.com/moo/550 http://%HOSTIP:%HTTPPORT ascii
 GET ftp://www.example.com/moo/550;type=a HTTP/1.1
 Host: www.example.com:21
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 <stdout>
diff --git a/tests/data/test551 b/tests/data/test551
index 6dd013375..ed6aee264 100644
--- a/tests/data/test551
+++ b/tests/data/test551
@@ -81,6 +81,7 @@ http://test.remote.example.com/path/551 http://%HOSTIP:%HTTPPORT s1lly:pers0n
 POST http://test.remote.example.com/path/551 HTTP/1.1
 Host: test.remote.example.com
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 36
 Content-Type: application/x-www-form-urlencoded
 
@@ -89,6 +90,7 @@ POST http://test.remote.example.com/path/551 HTTP/1.1
 Host: test.remote.example.com
 Proxy-Authorization: Digest username="s1lly", realm="something fun to read", nonce="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", uri="/path/551", response="3325240726fbdaf1e61f3a0dd40b930c"
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 36
 Content-Type: application/x-www-form-urlencoded
 
diff --git a/tests/data/test552 b/tests/data/test552
index c20e2049f..b44ca3455 100644
--- a/tests/data/test552
+++ b/tests/data/test552
diff --git a/tests/data/test555 b/tests/data/test555
index 6c09e3c1b..0f3bb07fc 100644
--- a/tests/data/test555
+++ b/tests/data/test555
@@ -115,6 +115,7 @@ POST http://test.remote.example.com/path/555 HTTP/1.1
 Host: test.remote.example.com
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 36
 Content-Type: application/x-www-form-urlencoded
 
@@ -124,6 +125,7 @@ Host: test.remote.example.com
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
@@ -132,6 +134,7 @@ Host: test.remote.example.com
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 36
 Content-Type: application/x-www-form-urlencoded
 
diff --git a/tests/data/test561 b/tests/data/test561
index 905e756b7..a6188eacf 100644
--- a/tests/data/test561
+++ b/tests/data/test561
@@ -56,6 +56,7 @@ FTP RETR with CURLOPT_PROXY_TRANSFER_MODE, ASCII transfer and type=i
 GET ftp://www.example.com/moo/561;type=i HTTP/1.1
 Host: www.example.com:21
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 <stdout>
diff --git a/tests/data/test563 b/tests/data/test563
index e4c00f50f..785152319 100644
--- a/tests/data/test563
+++ b/tests/data/test563
@@ -50,6 +50,7 @@ ftp_proxy=http://%HOSTIP:%HTTPPORT/
 GET FTP://%HOSTIP:%FTPPORT/563;type=A HTTP/1.1
 Host: %HOSTIP:%FTPPORT
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test590 b/tests/data/test590
index 334177676..55ea4f0e9 100644
--- a/tests/data/test590
+++ b/tests/data/test590
@@ -104,18 +104,21 @@ GET http://test.remote.example.com/path/590 HTTP/1.1
 Host: test.remote.example.com
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://test.remote.example.com/path/590 HTTP/1.1
 Host: test.remote.example.com
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://test.remote.example.com/path/590 HTTP/1.1
 Host: test.remote.example.com
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAAAgACAPYAAAAIAAgA+AAAAAAAAAAAAAAABoKBAB3Hr6SDn3NDNkgebbaP88ExMjM0MjIzNFIW4N7aYT44bAIg1jt2blUBAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAbWVjdXJsaG9zdA==
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test63 b/tests/data/test63
index 2a964492c..ccc19dd24 100644
--- a/tests/data/test63
+++ b/tests/data/test63
@@ -45,6 +45,7 @@ GET http://we.want.that.site.com/63 HTTP/1.1
 Host: we.want.that.site.com
 Proxy-Authorization: Basic ZmFrZTp1c2Vy
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test79 b/tests/data/test79
index 55fc2459f..b2566e229 100644
--- a/tests/data/test79
+++ b/tests/data/test79
@@ -48,6 +48,7 @@ ftp://%HOSTIP:%HTTPPORT/we/want/that/page/79 -x %HOSTIP:%HTTPPORT
 GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/79 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test80 b/tests/data/test80
index 8a635b45a..147a6aa12 100644
--- a/tests/data/test80
+++ b/tests/data/test80
@@ -68,6 +68,7 @@ CONNECT test.80:%HTTPPORT HTTP/1.0
 Host: test.80:%HTTPPORT
 Proxy-Authorization: Basic eW91YXJlOnlvdXJzZWxm
 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
+Proxy-Connection: Keep-Alive
 
 </proxy>
 <protocol>
diff --git a/tests/data/test81 b/tests/data/test81
index 53affa05f..dc054d293 100644
--- a/tests/data/test81
+++ b/tests/data/test81
@@ -89,12 +89,14 @@ Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://%HOSTIP:%HTTPPORT/81 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test82 b/tests/data/test82
index de3fcbaea..8b58f75da 100644
--- a/tests/data/test82
+++ b/tests/data/test82
@@ -49,6 +49,7 @@ Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test83 b/tests/data/test83
index 4fe8ba34a..120bcc6a1 100644
--- a/tests/data/test83
+++ b/tests/data/test83
@@ -64,6 +64,7 @@ http://test.83:%HTTPPORT/we/want/that/page/83 -p -x %HOSTIP:%PROXYPORT --user 'i
 CONNECT test.83:%HTTPPORT HTTP/1.1
 Host: test.83:%HTTPPORT
 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
+Proxy-Connection: Keep-Alive
 
 </proxy>
 <protocol>
diff --git a/tests/data/test84 b/tests/data/test84
index cf667d67a..629dae2fc 100644
--- a/tests/data/test84
+++ b/tests/data/test84
@@ -47,6 +47,7 @@ Host: %HOSTIP:%HTTPPORT
 Authorization: Basic aWFtOm15c2VsZg==
 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test85 b/tests/data/test85
index a11363f50..cb5e6e052 100644
--- a/tests/data/test85
+++ b/tests/data/test85
@@ -51,6 +51,7 @@ Proxy-Authorization: Basic dGVzdGluZzp0aGlz
 Authorization: Basic aWFtOm15c2VsZg==
 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test93 b/tests/data/test93
index 948d29c4d..138724835 100644
--- a/tests/data/test93
+++ b/tests/data/test93
@@ -43,6 +43,7 @@ http://%HOSTIP:%HTTPPORT/93 -x %HOSTIP:%HTTPPORT
 GET http://%HOSTIP:%HTTPPORT/93 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test94 b/tests/data/test94
index 94c894cb2..2f3f4824d 100644
--- a/tests/data/test94
+++ b/tests/data/test94
@@ -51,6 +51,7 @@ https://test.anything.really.com:94 --proxy1.0 %HOSTIP:%HTTPPORT
 CONNECT test.anything.really.com:94 HTTP/1.0
 User-Agent: curl/7.11.0-CVS (i686-pc-linux-gnu) libcurl/7.11.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4
 Host: test.anything.really.com:94
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test95 b/tests/data/test95
index 2b3e2c22c..1cd88acab 100644
--- a/tests/data/test95
+++ b/tests/data/test95
@@ -64,6 +64,7 @@ http://test.95:%HTTPPORT/we/want/that/page/95 -p -x %HOSTIP:%PROXYPORT -d "datat
 CONNECT test.95:%HTTPPORT HTTP/1.1
 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
 Host: test.95:%HTTPPORT
+Proxy-Connection: Keep-Alive
 
 </proxy>
 <protocol nonewline="yes">
author	Daniel Stenberg <daniel@haxx.se>	2016-08-16 08:36:04 +0200
committer	Daniel Stenberg <daniel@haxx.se>	2016-08-16 08:36:04 +0200
commit	93b0d907d57453b481cd9aa15bd258942e4dd34e (patch)
tree	56b402c03f954d5a909391aef982f7cfabb7d76d
parent	84e45f4b3ae49978cca282bf652d30c376518827 (diff)
download	curl-93b0d907d57453b481cd9aa15bd258942e4dd34e.tar.gz