Proxy-Connection: stop sending this header by default

RFC 7230 says we should stop. Firefox already stopped.

Bug: https://github.com/curl/curl/issues/633
Reported-By: Brad Fitzpatrick
Closes #633

diff --git a/lib/http.c b/lib/http.c
index 53c6cf8898ee4f363b3ec59f233f9651c18e638d..62952a871e658a6079a69412e388aa71d5c3a932 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, 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
@@ -2292,7 +2292,6 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
                      "%s" /* TE: */
                      "%s" /* accept-encoding */
                      "%s" /* referer */
-                     "%s" /* Proxy-Connection */
                      "%s",/* transfer-encoding */
 
                      ftp_typecode,
@@ -2315,10 +2314,6 @@ 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 46727e550350cdab5b01071744c03fc3aeacc3b3..e082ba291a81f47748165f38efbf612a16d52266 100644 (file)
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, 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
@@ -150,7 +150,6 @@ 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";
@@ -171,9 +170,6 @@ 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;
@@ -183,15 +179,13 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn,
                            "CONNECT %s HTTP/%s\r\n"
                            "%s"  /* Host: */
                            "%s"  /* Proxy-Authorization */
-                           "%s"  /* User-Agent */
-                           "%s", /* Proxy-Connection */
+                           "%s", /* User-Agent */
                            hostheader,
                            http,
                            host,
                            conn->allocptr.proxyuserpwd?
                            conn->allocptr.proxyuserpwd:"",
-                           useragent,
-                           proxyconn);
+                           useragent);
 
         if(host && *host)
           free(host);

diff --git a/tests/data/test1001 b/tests/data/test1001
index 91b13203eba7bb302a0f3ad02a74f58ba50327c8..60e68a894736498e857faaa44432ef4f78c035fd 100644 (file)
--- a/tests/data/test1001
+++ b/tests/data/test1001
@@ -89,7 +89,6 @@ Host: %HOSTIP:%HTTPPORT
 Content-Range: bytes 2-4/5\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
 \r
 GET http://%HOSTIP:%HTTPPORT/1001 HTTP/1.1\r
@@ -97,7 +96,6 @@ Host: %HOSTIP:%HTTPPORT
 Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1001", response="6af4d89c952f4dd4cc215a6878dc499d"\r
 Content-Range: bytes 2-4/5\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 3\r
 Expect: 100-continue\r
 \r

diff --git a/tests/data/test1002 b/tests/data/test1002
index 83cce6e4475a34a4751473eeb4c67f27ca38096a..83b87b9e45aaf6113664e9e1cd06ed7b438f5bcb 100644 (file)
--- a/tests/data/test1002
+++ b/tests/data/test1002
@@ -88,7 +88,6 @@ Host: %HOSTIP:%HTTPPORT
 Content-Range: bytes 2-4/5\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
 \r
 GET http://%HOSTIP:%HTTPPORT/1002.upload1 HTTP/1.1\r
@@ -96,7 +95,6 @@ Host: %HOSTIP:%HTTPPORT
 Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1002.upload1", response="198aa9b6acb4b0c71d02a197a5e41f54"\r
 Content-Range: bytes 2-4/5\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 3\r
 Expect: 100-continue\r
 \r
@@ -107,7 +105,6 @@ Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", u
 Content-Range: bytes 2-4/5\r
 User-Agent: curl/7.16.1\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 3\r
 Expect: 100-continue\r
 \r

diff --git a/tests/data/test1008 b/tests/data/test1008
index bcc503e5a70ecdaaf393d9d1e5a81520c35baffb..1dac3956fb86e78044703f90546d70093c2e1072 100644 (file)
--- a/tests/data/test1008
+++ b/tests/data/test1008
@@ -114,12 +114,10 @@ chkhostname curlhost
 CONNECT test.remote.example.com.1008:%HTTPPORT HTTP/1.1\r
 Host: test.remote.example.com.1008:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-Proxy-Connection: Keep-Alive\r
 \r
 CONNECT test.remote.example.com.1008:%HTTPPORT HTTP/1.1\r
 Host: test.remote.example.com.1008:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET /path/10080002 HTTP/1.1\r
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4\r

diff --git a/tests/data/test1021 b/tests/data/test1021
index 3ac9e12e62eeb1957dda35773e77e5e51abd002a..3bd64bdd3b0bcdd61dae3fc86d3e1d17b1acf0a8 100644 (file)
--- a/tests/data/test1021
+++ b/tests/data/test1021
@@ -119,17 +119,14 @@ chkhostname curlhost
 <protocol>
 CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1\r
 Host: test.remote.example.com.1021:%HTTPPORT\r
-Proxy-Connection: Keep-Alive\r
 \r
 CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1\r
 Host: test.remote.example.com.1021:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-Proxy-Connection: Keep-Alive\r
 \r
 CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1\r
 Host: test.remote.example.com.1021:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET /path/10210002 HTTP/1.1\r
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4\r

diff --git a/tests/data/test1034 b/tests/data/test1034
index c47574051328a2808fb1195be45342da2a97364b..f1426849771613e7686ab6c7ecf65a3e380059f6 100644 (file)
--- a/tests/data/test1034
+++ b/tests/data/test1034
@@ -55,7 +55,6 @@ http://invalid-utf8-
 GET http://invalid-utf8-â\90.local/page/1034 HTTP/1.1\r
 Host: invalid-utf8-â\90.local\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test1035 b/tests/data/test1035
index 20b434c34142834372ead7ab474f1b00003135c6..e1c2af637d6b27b5cfb57832b9f01fb346fb055b 100644 (file)
--- a/tests/data/test1035
+++ b/tests/data/test1035
@@ -52,7 +52,6 @@ http://too-long-IDN-name-c
 GET http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/1035 HTTP/1.1\r
 Host: too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test1059 b/tests/data/test1059
index 6820ea6791eaef7d2177f50c2940222272e1f3a9..ee4e6a78abc2240dd668044e5788b23fa0c1e25b 100644 (file)
--- a/tests/data/test1059
+++ b/tests/data/test1059
@@ -51,7 +51,6 @@ ftp://test-number:1059/wanted/page -p -x %HOSTIP:%HTTPPORT
 <protocol>
 CONNECT test-number:1059 HTTP/1.1\r
 Host: test-number:1059\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test1060 b/tests/data/test1060
index e4aea658931fc473e60403d189c5c645aa339666..1094792af697f0d236077a4594f1c535ec798e17 100644 (file)
--- a/tests/data/test1060
+++ b/tests/data/test1060
@@ -887,12 +887,10 @@ http://test.remote.haxx.se.1060:8990/path/10600002 --proxy http://%HOSTIP:%HTTPP
 <protocol>
 CONNECT test.remote.haxx.se.1060:8990 HTTP/1.1\r
 Host: test.remote.haxx.se.1060:8990\r
-Proxy-Connection: Keep-Alive\r
 \r
 CONNECT test.remote.haxx.se.1060:8990 HTTP/1.1\r
 Host: test.remote.haxx.se.1060:8990\r
 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.1060:8990", response="e1fbed39c26f4efe284adc0e576ff638"\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET /path/10600002 HTTP/1.1\r
 Host: test.remote.haxx.se.1060:8990\r

diff --git a/tests/data/test1061 b/tests/data/test1061
index a55a272954160226ef5320e3baedbde94782ac84..4f53a87a96b06ec0aaa301dc71a6759e2a0d2137 100644 (file)
--- a/tests/data/test1061
+++ b/tests/data/test1061
@@ -892,12 +892,10 @@ http://test.remote.haxx.se.1061:8990/path/10610002 --proxy http://%HOSTIP:%HTTPP
 <protocol>
 CONNECT test.remote.haxx.se.1061:8990 HTTP/1.1\r
 Host: test.remote.haxx.se.1061:8990\r
-Proxy-Connection: Keep-Alive\r
 \r
 CONNECT test.remote.haxx.se.1061:8990 HTTP/1.1\r
 Host: test.remote.haxx.se.1061:8990\r
 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.1061:8990", response="4e23449fa93224834299e7282a70472c"\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET /path/10610002 HTTP/1.1\r
 Host: test.remote.haxx.se.1061:8990\r

diff --git a/tests/data/test1077 b/tests/data/test1077
index a3c90245a7438b30e153badf5b16e76067c47ced..e71d756949374c535d536acf0dd18867d1166c83 100644 (file)
--- a/tests/data/test1077
+++ b/tests/data/test1077
@@ -30,7 +30,6 @@ Server: test-server/fake
 Content-Type: text/plain\r
 Content-Length: 9\r
 Funny-head: yesyes\r
-Proxy-Connection: Keep-Alive\r
 \r
 contents
 </data2>
@@ -63,12 +62,10 @@ FTP over HTTP proxy with downgrade to HTTP 1.0
 GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/1077 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/10770002 HTTP/1.0\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test1078 b/tests/data/test1078
index a9bb771be7110cbb591c09e0988b27792736affb..f04bad36fd71f123f47ec9f96ea6585a67815435 100644 (file)
--- a/tests/data/test1078
+++ b/tests/data/test1078
@@ -56,7 +56,6 @@ HTTP 1.0 CONNECT with proxytunnel and downgrade GET to HTTP/1.0
 <proxy>
 CONNECT %HOSTIP.1078:%HTTPPORT HTTP/1.0\r
 Host: %HOSTIP.1078:%HTTPPORT\r
-Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>

diff --git a/tests/data/test1087 b/tests/data/test1087
index d228976ac97b241ff79e6ccc9e1110f0f2801e96..1fb13cbef5783885d348f229468cdf7b2852d25d 100644 (file)
--- a/tests/data/test1087
+++ b/tests/data/test1087
@@ -92,18 +92,15 @@ 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\r
 Host: first.host.it.is\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://first.host.it.is/we/want/that/page/10871000 HTTP/1.1\r
 Host: first.host.it.is\r
 Authorization: Basic aWFtOm15c2VsZg==\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://goto.second.host.now/10871002 HTTP/1.1\r
 Host: goto.second.host.now\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test1088 b/tests/data/test1088
index a807ce9e50168a3ef9c19a6b34dfbbb10b3b6cc2..9801fff14247e81e9cc978814d6fd5dd04825278 100644 (file)
--- a/tests/data/test1088
+++ b/tests/data/test1088
@@ -93,19 +93,16 @@ 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\r
 Host: first.host.it.is\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://first.host.it.is/we/want/that/page/10881000 HTTP/1.1\r
 Host: first.host.it.is\r
 Authorization: Basic aWFtOm15c2VsZg==\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://goto.second.host.now/10881002 HTTP/1.1\r
 Host: goto.second.host.now\r
 Authorization: Basic aWFtOm15c2VsZg==\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test1092 b/tests/data/test1092
index adef4320b8fcb40cd4677efa1bffca19b7f96c6b..ce843f000d21c6958b3c2db6c0c3850cdfdc99eb 100644 (file)
--- a/tests/data/test1092
+++ b/tests/data/test1092
@@ -49,7 +49,6 @@ FTP with type=i over HTTP proxy
 GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/1092;type=i HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test1097 b/tests/data/test1097
index 3b733a55a99add27afeb0b44919f4bff99b623f3..81ea8552d41622c7d21d071a3dc3acdbd3258ecd 100644 (file)
--- a/tests/data/test1097
+++ b/tests/data/test1097
@@ -67,7 +67,6 @@ CONNECT test.a.galaxy.far.far.away.1097:%HTTPPORT HTTP/1.1
 Host: test.a.galaxy.far.far.away.1097:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 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\r
-Proxy-Connection: Keep-Alive\r
 \r
 POST /1097 HTTP/1.1\r
 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\r

diff --git a/tests/data/test1098 b/tests/data/test1098
index 9805648102a09bc6b07830df9d746b48552bebfd..70a6f3913eee490a3b7ba00e4f8dfe28dc4ed22c 100644 (file)
--- a/tests/data/test1098
+++ b/tests/data/test1098
@@ -49,12 +49,10 @@ ftp://ftp-site/moo/1098 ftp://ftp-site/moo/1098 --proxy http://%HOSTIP:%HTTPPORT
 GET ftp://ftp-site/moo/1098 HTTP/1.1\r
 Host: ftp-site:21\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET ftp://ftp-site/moo/1098 HTTP/1.1\r
 Host: ftp-site:21\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 <stdout>

diff --git a/tests/data/test1104 b/tests/data/test1104
index 21efe3c15e1da4d55738e82b392d0aea8713eebd..4df81a1a2c69bb1db4f544eef38093639893c867 100644 (file)
--- a/tests/data/test1104
+++ b/tests/data/test1104
@@ -72,12 +72,10 @@ http://%HOSTIP:%HTTPPORT/want/1104 -L -x %HOSTIP:%HTTPPORT -c log/cookies.jar
 GET http://%HOSTIP:%HTTPPORT/want/1104 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://%HOSTIP:%HTTPPORT/want/data/11040002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Cookie: test2=true\r
 \r
 </protocol>

diff --git a/tests/data/test1106 b/tests/data/test1106
index 0c6bec1773bbb47dd3fb5023146b917d650a4a11..a2adbbb3fff90a192e24590f0026dbc9893e2917 100644 (file)
--- a/tests/data/test1106
+++ b/tests/data/test1106
@@ -50,7 +50,6 @@ ftp://%HOSTIP:23456/1106
 GET ftp://%HOSTIP:23456/1106 HTTP/1.1\r
 Host: %HOSTIP:23456\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test1213 b/tests/data/test1213
index 4f22f0d92dc539761574c1ef6159d436a47c948b..bc146b016a0649efb850e94b890fb17a9044cfe3 100644 (file)
--- a/tests/data/test1213
+++ b/tests/data/test1213
@@ -46,7 +46,6 @@ HTTP with proxy and host-only URL
 GET http://we.want.that.site.com.1213/ HTTP/1.1\r
 Host: we.want.that.site.com.1213\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test1214 b/tests/data/test1214
index 3eeb3e3ad3d06a395a15281c63be6fb162c25512..e703f7a911e500ac47d50d539a72b02ed108913f 100644 (file)
--- a/tests/data/test1214
+++ b/tests/data/test1214
@@ -46,7 +46,6 @@ HTTP with proxy and URL with ? and no slash separator
 GET http://we.want.that.site.com.1214/?moo=foo HTTP/1.1\r
 Host: we.want.that.site.com.1214\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test1215 b/tests/data/test1215
index f8c52a9a140f226d88ce54d7bda6eab8abd245a1..e22591c90601ae929084b3a9211f361d964dbaaf 100644 (file)
--- a/tests/data/test1215
+++ b/tests/data/test1215
@@ -92,14 +92,12 @@ Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/7.30.0-DEV\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://%HOSTIP:%HTTPPORT/1215 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==\r
 User-Agent: curl/7.30.0-DEV\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test1216 b/tests/data/test1216
index 5beda797d9ea3fb75530615acffc9dfb370c2d23..6e45ac6a3e378bc09a994a17629ea82e61abfd90 100644 (file)
--- a/tests/data/test1216
+++ b/tests/data/test1216
@@ -50,13 +50,11 @@ example.fake        TRUE    /c      FALSE   2139150993      moo3    indeed
 GET http://example.fake/c/1216 HTTP/1.1\r
 Host: example.fake\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Cookie: moo2=indeed; moo3=indeed\r
 \r
 GET http://bexample.fake/c/1216 HTTP/1.1\r
 Host: bexample.fake\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test1218 b/tests/data/test1218
index 7d865476ae4898f01e72d55d98e0b5448dbfb060..ee18cb52844ff4299d1cdff37eb7ad72a269a8f9 100644 (file)
--- a/tests/data/test1218
+++ b/tests/data/test1218
@@ -43,18 +43,15 @@ http://example.fake/c/1218 http://example.fake/c/1218 http://bexample.fake/c/121
 GET http://example.fake/c/1218 HTTP/1.1\r
 Host: example.fake\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://example.fake/c/1218 HTTP/1.1\r
 Host: example.fake\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Cookie: bug=fixed\r
 \r
 GET http://bexample.fake/c/1218 HTTP/1.1\r
 Host: bexample.fake\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test1228 b/tests/data/test1228
index a7e56a7975926de20a1981da5a9dd70de7e23b1c..d0af517de769a9243fcfd3920f8ed38facc00a1c 100644 (file)
--- a/tests/data/test1228
+++ b/tests/data/test1228
@@ -42,12 +42,10 @@ http://example.fake/hoge/1228 http://example.fake/hogege/ -b nonexisting -x %HOS
 GET http://example.fake/hoge/1228 HTTP/1.1\r
 Host: example.fake\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://example.fake/hogege/ HTTP/1.1\r
 Host: example.fake\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Cookie: path1=root\r
 \r
 </protocol>

diff --git a/tests/data/test1230 b/tests/data/test1230
index 3c1d3d448a33e97ffe149ce43faa1353861646a1..8ce4c4ee630f41044ad8a6f016654757110b0e51 100644 (file)
--- a/tests/data/test1230
+++ b/tests/data/test1230
@@ -69,7 +69,6 @@ http://[1234:1234:1234::4ce]:%HTTPPORT/wanted/page/1230 -p -x %HOSTIP:%HTTPPORT
 <protocol>
 CONNECT [1234:1234:1234::4ce]:%HTTPPORT HTTP/1.1\r
 Host: [1234:1234:1234::4ce]:%HTTPPORT\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET /wanted/page/1230 HTTP/1.1\r
 Host: [1234:1234:1234::4ce]:%HTTPPORT\r

diff --git a/tests/data/test1232 b/tests/data/test1232
index ead43365f8f87a30e2a719f9b95d0fd34f950fbc..1c5bc2031be3cf4ffc4f5212d05a3330065d9e1a 100644 (file)
--- a/tests/data/test1232
+++ b/tests/data/test1232
@@ -53,12 +53,10 @@ 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\r
 Host: test.remote.haxx.se.1232:8990\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://test.remote.haxx.se.1232:8990/hej/but/12320001 HTTP/1.1\r
 Host: test.remote.haxx.se.1232:8990\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test1241 b/tests/data/test1241
index aaa568868a88353545d44780e3adc4e74636ca53..5a127326ded64201529f106bb097ce88abf573c3 100644 (file)
--- a/tests/data/test1241
+++ b/tests/data/test1241
@@ -52,12 +52,10 @@ HTTP _without_ dotdot removal
 GET http://test.remote.haxx.se.1241:8990/../../hej/but/who/../1241?stupid=me/../1241 HTTP/1.1\r
 Host: test.remote.haxx.se.1241:8990\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://test.remote.haxx.se.1241:8990/../../hej/but/who/../12410001 HTTP/1.1\r
 Host: test.remote.haxx.se.1241:8990\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test1314 b/tests/data/test1314
index 078ada64adaea1f00925648acd1f5793ab4eb91d..11e128a85fa2c11e0029417dffbb319001a90a25 100644 (file)
--- a/tests/data/test1314
+++ b/tests/data/test1314
@@ -67,12 +67,10 @@ http://firstplace.example.com/want/1314 -L -x http://%HOSTIP:%HTTPPORT
 GET http://firstplace.example.com/want/1314 HTTP/1.1\r
 Host: firstplace.example.com\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://somewhere.example.com/reply/1314 HTTP/1.1\r
 Host: somewhere.example.com\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test1319 b/tests/data/test1319
index 0520b1b328b886ffd78badd971fa4bec4c88a04c..a97da9c41a71d8345490e8158741db50ff1614ae 100644 (file)
--- a/tests/data/test1319
+++ b/tests/data/test1319
@@ -79,7 +79,6 @@ QUIT
 CONNECT pop.1319:%POP3PORT HTTP/1.1\r
 Host: pop.1319:%POP3PORT\r
 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\r
-Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 </verify>

diff --git a/tests/data/test1320 b/tests/data/test1320
index 7a15f8091af64445cec160ccd9a74d9e45725bd5..609f4c2f77cf76c3e1ed29d91ffcaf3e323b4544 100644 (file)
--- a/tests/data/test1320
+++ b/tests/data/test1320
@@ -66,7 +66,6 @@ body
 CONNECT smtp.1320:%SMTPPORT HTTP/1.1\r
 Host: smtp.1320:%SMTPPORT\r
 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\r
-Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 </verify>

diff --git a/tests/data/test1321 b/tests/data/test1321
index 266fd8828957ff583d52b08edfbcc3dbf8a29e98..b5ad277b05e3e5704caa6f077dd22883bc33c35f 100644 (file)
--- a/tests/data/test1321
+++ b/tests/data/test1321
@@ -75,7 +75,6 @@ A005 LOGOUT
 CONNECT imap.1321:%IMAPPORT HTTP/1.1\r
 Host: imap.1321:%IMAPPORT\r
 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\r
-Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 </verify>

diff --git a/tests/data/test1331 b/tests/data/test1331
index 3299df469c0e040213560f41b3f418c9afa7521e..837ef8dd7bbda13c6afb2751e58875fa62fa89fe 100644 (file)
--- a/tests/data/test1331
+++ b/tests/data/test1331
@@ -75,13 +75,11 @@ HTTP --proxy-anyauth and 407 with cookies
 GET http://z.x.com/1331 HTTP/1.1\r
 Host: z.x.com\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://z.x.com/1331 HTTP/1.1\r
 Host: z.x.com\r
 Proxy-Authorization: Basic bXluYW1lOm15cGFzc3dvcmQ=\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Cookie: proxycookie=weirdo\r
 \r
 </protocol>

diff --git a/tests/data/test1415 b/tests/data/test1415
index 5604404079f153f6ff81dae18ff70d4a6be5b2ce..37cfb073b6591b80781151b3b6027c8a822c4ab6 100644 (file)
--- a/tests/data/test1415
+++ b/tests/data/test1415
@@ -57,7 +57,6 @@ 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\r
 Host: example.com\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 

diff --git a/tests/data/test1421 b/tests/data/test1421
index 6c59b2160d572a0db3f7f0428792ff895124994b..889c938db7585f308c0cd2d3aaf9e4a0a6fd00e4 100644 (file)
--- a/tests/data/test1421
+++ b/tests/data/test1421
@@ -59,12 +59,10 @@ Content-Length: 6
 GET http://test.remote.haxx.se.1421:8990/ HTTP/1.1\r
 Host: test.remote.haxx.se.1421:8990\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://different.remote.haxx.se.1421:8990/ HTTP/1.1\r
 Host: different.remote.haxx.se.1421:8990\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 [DISCONNECT]
 </protocol>

diff --git a/tests/data/test1428 b/tests/data/test1428
index 59041ec9620f5e4df0fcd09a3845f713a0cba9bf..60fb8a93e4586363f123edebda1cc898a08699be 100644 (file)
--- a/tests/data/test1428
+++ b/tests/data/test1428
@@ -64,7 +64,6 @@ http://test.1428:%HTTPPORT/we/want/that/page/1428 -p -x %HOSTIP:%PROXYPORT --use
 CONNECT test.1428:%HTTPPORT HTTP/1.1\r
 Host: test.1428:%HTTPPORT\r
 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3\r
-Proxy-Connection: Keep-Alive\r
 header-type: proxy\r
 \r
 </proxy>

diff --git a/tests/data/test1509 b/tests/data/test1509
index b4bfc660309257389df48fbb57bba3ebaf898efb..18eb07f1ec8d78a64278f53e6cbc355a6addc8ca 100644 (file)
--- a/tests/data/test1509
+++ b/tests/data/test1509
@@ -74,7 +74,6 @@ moo
 <proxy>
 CONNECT the.old.moo.1509:%HTTPPORT HTTP/1.1\r
 Host: the.old.moo.1509:%HTTPPORT\r
-Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>

diff --git a/tests/data/test1525 b/tests/data/test1525
index 0560d5c1a85001495c19577175b4f66257949e9e..d8f68838db5ee5ae1ce546d32f3699175017639a 100644 (file)
--- a/tests/data/test1525
+++ b/tests/data/test1525
@@ -58,7 +58,6 @@ CURLOPT_PROXYHEADER is ignored CURLHEADER_UNIFIED
 <proxy>
 CONNECT the.old.moo.1525:%HTTPPORT HTTP/1.1\r
 Host: the.old.moo.1525:%HTTPPORT\r
-Proxy-Connection: Keep-Alive\r
 User-Agent: Http Agent\r
 \r
 </proxy>

diff --git a/tests/data/test1526 b/tests/data/test1526
index aa111c890e3f795be044975b4bff8dc67f0dbfb1..9f5d09e6d88dd8ea9b03eb0ba96f9e232b25a567 100644 (file)
--- a/tests/data/test1526
+++ b/tests/data/test1526
@@ -58,7 +58,6 @@ CURLOPT_PROXYHEADER: separate host/proxy headers
 <proxy>
 CONNECT the.old.moo.1526:%HTTPPORT HTTP/1.1\r
 Host: the.old.moo.1526:%HTTPPORT\r
-Proxy-Connection: Keep-Alive\r
 User-Agent: Proxy Agent\r
 \r
 </proxy>

diff --git a/tests/data/test1527 b/tests/data/test1527
index e8d52794b9c3902a941efcb6f5411891dcee267c..69ae6e4a060c80ae164e62a14f903e3abd15f923 100644 (file)
--- a/tests/data/test1527
+++ b/tests/data/test1527
@@ -57,7 +57,6 @@ Check same headers are generated with CURLOPT_HEADEROPT == CURLHEADER_UNIFIED
 <proxy>
 CONNECT the.old.moo.1527:%HTTPPORT HTTP/1.1\r
 Host: the.old.moo.1527:%HTTPPORT\r
-Proxy-Connection: Keep-Alive\r
 User-Agent: Http Agent\r
 Expect: 100-continue\r
 \r

diff --git a/tests/data/test1528 b/tests/data/test1528
index 876806af4c012bead7cada915430e8e2dfba27a1..e60f6002607c0bb3f6b5837fe90eccc56898775e 100644 (file)
--- a/tests/data/test1528
+++ b/tests/data/test1528
@@ -51,7 +51,6 @@ Separately specified proxy/server headers sent in a proxy GET
 GET http://the.old.moo:%HTTPPORT/1528 HTTP/1.1\r
 Host: the.old.moo:%HTTPPORT\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 User-Agent: Http Agent\r
 Proxy-User-Agent: Http Agent2\r
 \r

diff --git a/tests/data/test16 b/tests/data/test16
index 15f4c7a7b978531c8bd4c8a435031aa5d718e2fc..9d9a9cc1c2546076b7b5510d2a847f4d252cdbfd 100644 (file)
--- a/tests/data/test16
+++ b/tests/data/test16
@@ -45,7 +45,6 @@ GET http://we.want.that.site.com/16 HTTP/1.1
 Host: we.want.that.site.com\r
 Proxy-Authorization: Basic ZmFrZUB1c2VyOmxvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29uZw==\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test162 b/tests/data/test162
index ee2f40aa7503e83746d465abdf1088a00ecba95a..cc4c82d45b2a2c221094edc6e9ae3fbc4fe61729 100644 (file)
--- a/tests/data/test162
+++ b/tests/data/test162
@@ -51,7 +51,6 @@ Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 <errorcode>

diff --git a/tests/data/test165 b/tests/data/test165
index ddfe1e9dc6f24ad86f6224ff2a64f87c93d370c9..b475fdef15300201167bf23792d0b372cd0db5a6 100644 (file)
--- a/tests/data/test165
+++ b/tests/data/test165
@@ -51,7 +51,6 @@ http://www.
 GET http://www.xn--4cab6c.se/page/165 HTTP/1.1\r
 Host: www.xn--4cab6c.se\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test167 b/tests/data/test167
index 0b14996a33f0c412e41b583bd75d9cf9ef7207fd..76f9e5c7f8927905fbb68f1f3507ee9eabfaf255 100644 (file)
--- a/tests/data/test167
+++ b/tests/data/test167
@@ -65,7 +65,6 @@ Host: data.from.server.requiring.digest.hohoho.com
 Proxy-Authorization: Basic Zm9vOmJhcg==\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://data.from.server.requiring.digest.hohoho.com/167 HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
@@ -73,7 +72,6 @@ Proxy-Authorization: Basic Zm9vOmJhcg==
 Authorization: Digest username="digest", realm="weirdorealm", nonce="12345", uri="/167", response="13c7c02a252cbe1c46d8669898a3be26"\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test168 b/tests/data/test168
index 20e0b6d9c28e5027b5535e748bbd4c069420e509..0f4e02573fcf3a97f8fcb937d2ff2e02e05736f1 100644 (file)
--- a/tests/data/test168
+++ b/tests/data/test168
@@ -78,14 +78,12 @@ GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1
 Host: data.from.server.requiring.digest.hohoho.com\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
 Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/168", response="fb8608e00ad9239a3dedb14bc8575976"\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
@@ -93,7 +91,6 @@ Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345",
 Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/168", response="ca87f2d768a231e2d637a55698d5c416"\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test169 b/tests/data/test169
index 73ca9bd20c5c4f95676c8f998dfd83897b702b47..be5b4c6d94bbb8d96af49cd65bb03fd97b93f3ae 100644 (file)
--- a/tests/data/test169
+++ b/tests/data/test169
@@ -108,21 +108,18 @@ Host: data.from.server.requiring.digest.hohoho.com
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
 Authorization: Digest username="digest", realm="r e a l m", nonce="abcdef", uri="/169", response="95d48591985a03c4b49cb962aa7bd3e6"\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test170 b/tests/data/test170
index 8ce7774f94d43e592ca9a802f6463a41f5ce385e..48a263f464b5fa6571049e05e61a547231e36097 100644 (file)
--- a/tests/data/test170
+++ b/tests/data/test170
@@ -40,7 +40,6 @@ Host: a.galaxy.far.far.away
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
 \r
 </protocol>

diff --git a/tests/data/test171 b/tests/data/test171
index 09e48b70af119b107abd2a5b5334363ff28fa044..3b9f7ba8cee58eca4b96569a8fc6fa3cecdba0fd 100644 (file)
--- a/tests/data/test171
+++ b/tests/data/test171
@@ -44,7 +44,6 @@ HTTP, get cookie with dot prefixed full domain
 GET http://z.x.com/171 HTTP/1.1\r
 Host: z.x.com\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 <file name="log/jar171" mode="text">

diff --git a/tests/data/test179 b/tests/data/test179
index f8f7811a7e7c1814f0c372aebf8d46a539b572f5..1cd5badf1cffae8f14ef350d7b1bed3f063ddbcd 100644 (file)
--- a/tests/data/test179
+++ b/tests/data/test179
@@ -49,7 +49,6 @@ supertrooper.fake     FALSE   /c      FALSE   2139150993      moo2    indeed
 GET http://supertrooper.fake/c/179 HTTP/1.1\r
 Host: supertrooper.fake\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Cookie: moo2=indeed\r
 \r
 </protocol>

diff --git a/tests/data/test183 b/tests/data/test183
index f34dc0c98743e91126029265a87dc321aac0fed8..b44710998d70e01afbbbdd51ca396e81d55251be 100644 (file)
--- a/tests/data/test183
+++ b/tests/data/test183
@@ -42,13 +42,11 @@ 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\r
 Host: deathstar.another.galaxy\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://a.galaxy.far.far.away/183 HTTP/1.1\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 

diff --git a/tests/data/test184 b/tests/data/test184
index 8b09dde28eee584a6626bcb26852ee4ac2361e6e..9cadc8290b3b1be5bdfc961cd57b6437cc2c25a0 100644 (file)
--- a/tests/data/test184
+++ b/tests/data/test184
@@ -62,12 +62,10 @@ GET http://deathstar.another.galaxy/184 HTTP/1.1
 Host: another.visitor.stay.a.while.stay.foreeeeeever\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://yet.another.host/184 HTTP/1.1\r
 Host: yet.another.host\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 

diff --git a/tests/data/test185 b/tests/data/test185
index 298dd49ced641bdc0189e3995fc63f0a4d1b0b0c..dbef6e7ea45825cd2775b5fd3b99427cb01c28a9 100644 (file)
--- a/tests/data/test185
+++ b/tests/data/test185
@@ -62,12 +62,10 @@ GET http://deathstar.another.galaxy/185 HTTP/1.1
 Host: another.visitor.stay.a.while.stay.foreeeeeever\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://deathstar.another.galaxy/go/west/185 HTTP/1.1\r
 Host: another.visitor.stay.a.while.stay.foreeeeeever\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 

diff --git a/tests/data/test2047 b/tests/data/test2047
index 4422978015d2d401a52446aaab917af9930a86ef..a8cca2f40136f00c45f78db0dadb3aab5a1e6c48 100644 (file)
--- a/tests/data/test2047
+++ b/tests/data/test2047
@@ -63,12 +63,10 @@ http://åäö.se/2047 -x %HOSTIP:%HTTPPORT -w "%{num_connects}\n%{num_redirects}
 GET http://xn--4cab6c.se/2047 HTTP/1.1\r
 Host: xn--4cab6c.se\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://xn--4cab6c.se/20470001 HTTP/1.1\r
 Host: xn--4cab6c.se\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 

diff --git a/tests/data/test206 b/tests/data/test206
index 5f0c885625d24f632bd3fbb784ee9da313368b86..efbc56e0cbb9fca3531be99359160b629c20ac74 100644 (file)
--- a/tests/data/test206
+++ b/tests/data/test206
@@ -90,12 +90,10 @@ http://test.remote.haxx.se.206:8990/path/2060002 --proxy http://%HOSTIP:%HTTPPOR
 <protocol>
 CONNECT test.remote.haxx.se.206:8990 HTTP/1.1\r
 Host: test.remote.haxx.se.206:8990\r
-Proxy-Connection: Keep-Alive\r
 \r
 CONNECT test.remote.haxx.se.206:8990 HTTP/1.1\r
 Host: test.remote.haxx.se.206:8990\r
 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.206:8990", response="003e36decb4dbf6366b3ecb9b87c24ec"\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET /path/2060002 HTTP/1.1\r
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4\r

diff --git a/tests/data/test208 b/tests/data/test208
index afb2566b5e36b96c6447ac7dfb6dd74ecf44adb8..fb4c0ea13afde3b3baea2c317c832f593faad128 100644 (file)
--- a/tests/data/test208
+++ b/tests/data/test208
@@ -57,7 +57,6 @@ PUT ftp://daniel:mysecret@host.com/we/want/208 HTTP/1.1
 Host: host.com:21\r
 Authorization: Basic ZGFuaWVsOm15c2VjcmV0\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 78\r
 Expect: 100-continue\r
 \r

diff --git a/tests/data/test209 b/tests/data/test209
index 961eba1a204081b348d98e04f4591ceed06ce152..f868541c6225bff717fcd318cc0616de40896a7e 100644 (file)
--- a/tests/data/test209
+++ b/tests/data/test209
@@ -104,12 +104,10 @@ chkhostname curlhost
 CONNECT test.remote.example.com.209:%HTTPPORT HTTP/1.1\r
 Host: test.remote.example.com.209:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-Proxy-Connection: Keep-Alive\r
 \r
 CONNECT test.remote.example.com.209:%HTTPPORT HTTP/1.1\r
 Host: test.remote.example.com.209:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET /path/2090002 HTTP/1.1\r
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4\r

diff --git a/tests/data/test213 b/tests/data/test213
index edbb6a6f38f4818759442d1f94ba0fbb9f5e91b0..7ceed9849a4db12e80013413a86f5da4331480db 100644 (file)
--- a/tests/data/test213
+++ b/tests/data/test213
@@ -104,12 +104,10 @@ chkhostname curlhost
 CONNECT test.remote.example.com.213:%HTTPPORT HTTP/1.0\r
 Host: test.remote.example.com.213:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-Proxy-Connection: Keep-Alive\r
 \r
 CONNECT test.remote.example.com.213:%HTTPPORT HTTP/1.0\r
 Host: test.remote.example.com.213:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==\r
-Proxy-Connection: Keep-Alive\r
 \r
 POST /path/2130002 HTTP/1.1\r
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4\r

diff --git a/tests/data/test217 b/tests/data/test217
index f10df566b7b9fd02f395b38fe37e226d2010c81d..0e0c0add1e8f1737e9968587f5e2c95ff4a7dc6a 100644 (file)
--- a/tests/data/test217
+++ b/tests/data/test217
@@ -44,7 +44,6 @@ http://test.remote.example.com.217:%HTTPPORT/path/2170002 --proxy http://%HOSTIP
 <protocol>
 CONNECT test.remote.example.com.217:%HTTPPORT HTTP/1.1\r
 Host: test.remote.example.com.217:%HTTPPORT\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 # CURLE_RECV_ERROR

diff --git a/tests/data/test233 b/tests/data/test233
index b631e52cf9c5b50ca65fedcac83f6cd8daa89ceb..996855d592879653453ad881cc074ffb3fbc3c08 100644 (file)
--- a/tests/data/test233
+++ b/tests/data/test233
@@ -81,13 +81,11 @@ Host: first.host.it.is
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
 Authorization: Basic aWFtOm15c2VsZg==\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://goto.second.host.now/2330002 HTTP/1.1\r
 Host: goto.second.host.now\r
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test234 b/tests/data/test234
index 1d2e05b39cd12914fba58007b60b30f0551a57f2..f7da2b95e88417d35766bc776f95690ac974a11f 100644 (file)
--- a/tests/data/test234
+++ b/tests/data/test234
@@ -83,14 +83,12 @@ Host: first.host.it.is
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
 Authorization: Basic aWFtOm15c2VsZg==\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://goto.second.host.now/2340002 HTTP/1.1\r
 Host: goto.second.host.now\r
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
 Authorization: Basic aWFtOm15c2VsZg==\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test239 b/tests/data/test239
index 6b92f07f7352533ee90d7ca790d9f7afd3234869..275c81b3c3105afb82d9d8edf8bf68440a3b475f 100644 (file)
--- a/tests/data/test239
+++ b/tests/data/test239
@@ -83,7 +83,6 @@ Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
@@ -92,7 +91,6 @@ Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 6\r
 Content-Type: application/x-www-form-urlencoded\r
 \r

diff --git a/tests/data/test243 b/tests/data/test243
index 3496055d1314aea4f3bb57922d499ee2b7f25890..bc09286ee9c40d538f29804499f12a386b8a1d1c 100644 (file)
--- a/tests/data/test243
+++ b/tests/data/test243
@@ -103,7 +103,6 @@ POST http://%HOSTIP:%HTTPPORT/243 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 6\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
@@ -112,7 +111,6 @@ Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
@@ -121,7 +119,6 @@ Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 6\r
 Content-Type: application/x-www-form-urlencoded\r
 \r

diff --git a/tests/data/test256 b/tests/data/test256
index 2b96ecf3d6c06731b8b1212defaa666d94838074..0acd9db123d582d07558482524bede81acd9dee0 100644 (file)
--- a/tests/data/test256
+++ b/tests/data/test256
@@ -51,7 +51,6 @@ Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: Basic ZGFuaWVsOnN0ZW5iZXJn\r
 Range: bytes=78-\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 

diff --git a/tests/data/test257 b/tests/data/test257
index 502448ddbf5ee1bd1013fbc5c726956e1f152b1f..45dcbd556f99ff8d48aa9d23f512f82d3206ce16 100644 (file)
--- a/tests/data/test257
+++ b/tests/data/test257
@@ -92,20 +92,17 @@ Host: supersite.com
 Authorization: Basic dXNlcjE6cGFzc3dkMQ==\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://anotherone.com/2570002 HTTP/1.1\r
 Host: anotherone.com\r
 Authorization: Basic dXNlcjI6cGFzc3dkMg==\r
 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: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://athird.com/2570003 HTTP/1.1\r
 Host: athird.com\r
 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: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test258 b/tests/data/test258
index 98c34014182e45d9fdf7bb873b2390b4e2145bcc..82c6731cc4ddcfcc5a3d2227c9a853929286c5b8 100644 (file)
--- a/tests/data/test258
+++ b/tests/data/test258
@@ -20,7 +20,6 @@ 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>
@@ -37,7 +36,6 @@ 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\r
@@ -83,7 +81,6 @@ POST http://remotehost:54321/we/want/258 HTTP/1.1
 Host: remotehost:54321\r
 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 409\r
 Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce\r
 \r
@@ -109,7 +106,6 @@ 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\r
 Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/258", response="2501654ca391f0b5c8c12a1da77e34cd"\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 409\r
 Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce\r
 \r

diff --git a/tests/data/test259 b/tests/data/test259
index 9532887a9662458a258200e351dbcc8d99b40616..75b1f531c93febf8faf30f46c33b03b7781d4aa5 100644 (file)
--- a/tests/data/test259
+++ b/tests/data/test259
@@ -79,7 +79,6 @@ POST http://remotehost:54321/we/want/259 HTTP/1.1
 Host: remotehost:54321\r
 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 409\r
 Expect: 100-continue\r
 Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce\r
@@ -106,7 +105,6 @@ 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\r
 Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/259", response="b479994d13e60f3aa192a67c5892ddc5"\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 409\r
 Expect: 100-continue\r
 Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce\r

diff --git a/tests/data/test263 b/tests/data/test263
index 5088141f5007142b165406796f7dc06d18e97507..df0ba032f9d1924e48a1a53661dc14265d754a84 100644 (file)
--- a/tests/data/test263
+++ b/tests/data/test263
@@ -47,7 +47,6 @@ HTTP-IPv6 GET with proxy specified using IPv6-numerical address
 GET http://veryveryremotesite.com/263 HTTP/1.1\r
 Host: veryveryremotesite.com\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test264 b/tests/data/test264
index f4d171a167870683f37cb5a44240be6b0772aa94..1174ca54dba6bbcb00ee5ab7736e8f4e9ff7c40a 100644 (file)
--- a/tests/data/test264
+++ b/tests/data/test264
@@ -42,7 +42,6 @@ GET http://we.want.that.site.com/264 HTTP/1.1
 Host: we.want.that.site.com\r
 Proxy-Authorization: Basic ZmFrZTp1c2Vy\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test265 b/tests/data/test265
index 1a162b808abd81e51bc02716564316236bd566e5..79ab183f08612f713f79a4dead3dd007498590dc 100644 (file)
--- a/tests/data/test265
+++ b/tests/data/test265
@@ -107,12 +107,10 @@ chkhostname curlhost
 CONNECT test.remote.example.com.265:%HTTPPORT HTTP/1.1\r
 Host: test.remote.example.com.265:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-Proxy-Connection: Keep-Alive\r
 \r
 CONNECT test.remote.example.com.265:%HTTPPORT HTTP/1.1\r
 Host: test.remote.example.com.265:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==\r
-Proxy-Connection: Keep-Alive\r
 \r
 POST /path/2650002 HTTP/1.1\r
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4\r

diff --git a/tests/data/test275 b/tests/data/test275
index 802c4bbccecf79a33fa4ea2abaae2370355c6c65..60004548219002b37e53ef811e3c06275073865a 100644 (file)
--- a/tests/data/test275
+++ b/tests/data/test275
@@ -69,7 +69,6 @@ CONNECT remotesite.com.275:%HTTPPORT HTTP/1.1
 Host: remotesite.com.275:%HTTPPORT\r
 Proxy-Authorization: Basic eW91YXJlOnlvdXJzZWxm\r
 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3\r
-Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>

diff --git a/tests/data/test278 b/tests/data/test278
index 3112264a3f87039fea661d10088df549dc32cf9f..e6f1ef705275a4c90e0a8dd3b51cfd0cdeaa2f91 100644 (file)
--- a/tests/data/test278
+++ b/tests/data/test278
@@ -42,7 +42,6 @@ GET http://we.want.that.site.com/278 HTTP/1.1
 Host: we.want.that.site.com\r
 Proxy-Authorization: Basic ZmFrZTo=\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test279 b/tests/data/test279
index 47f8b687eb2a764a9b52b07e7b222a1ee2fd3f31..5005daa5a60f230aa551dd9c3924f37083881f33 100644 (file)
--- a/tests/data/test279
+++ b/tests/data/test279
@@ -43,7 +43,6 @@ GET http://we.want.that.site.com/279 HTTP/1.1
 Host: we.want.that.site.com\r
 Proxy-Authorization: Basic ZmFrZTo=\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test287 b/tests/data/test287
index 6772e220f587b8f97a1b895c072386736d3ad68c..526446f40fb17899d0e73319534dfbf15259eb51 100644 (file)
--- a/tests/data/test287
+++ b/tests/data/test287
@@ -37,7 +37,6 @@ 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\r
 Host: test.remote.example.com.287:%HTTPPORT\r
-Proxy-Connection: Keep-Alive\r
 User-Agent: looser/2007\r
 \r
 </protocol>

diff --git a/tests/data/test299 b/tests/data/test299
index 4daaea47d54700808fc566eaa17306c8e0a446a6..a7b7755698e272c09afdfe0a4bf9887c9b87f474 100644 (file)
--- a/tests/data/test299
+++ b/tests/data/test299
@@ -46,7 +46,6 @@ GET ftp://michal:aybabtu@host.com/we/want/299 HTTP/1.1
 Host: host.com:21\r
 Authorization: Basic bWljaGFsOmF5YmFidHU=\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test43 b/tests/data/test43
index e5535bb3af5225626e21a4fbf99d5a6f8e65a3c7..dc0dd5fcd1d09edcc90844e3dac602c1f9a6e5e7 100644 (file)
--- a/tests/data/test43
+++ b/tests/data/test43
@@ -67,12 +67,10 @@ http://%HOSTIP:%HTTPPORT/want/43 -L -x %HOSTIP:%HTTPPORT
 GET http://%HOSTIP:%HTTPPORT/want/43 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://%HOSTIP:%HTTPPORT/want/data/430002.txt?coolsite=yes HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test5 b/tests/data/test5
index b62f1a127a6bfd2a426c7c04b8dab789d1e6e749..13314570b4f1e1bddbc86d89bb4818843ba25775 100644 (file)
--- a/tests/data/test5
+++ b/tests/data/test5
@@ -43,7 +43,6 @@ http://%HOSTIP:%HTTPPORT/we/want/that/page/5#5 -x %HOSTIP:%HTTPPORT
 GET http://%HOSTIP:%HTTPPORT/we/want/that/page/5 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test503 b/tests/data/test503
index e8dc21e8dbbd888be45c512201fb456f60c8ad59..f02bac6f327b369fb23ac34d0b41ba5a9ca13abe 100644 (file)
--- a/tests/data/test503
+++ b/tests/data/test503
@@ -72,7 +72,6 @@ moo
 CONNECT machine.503:%HTTPPORT HTTP/1.1\r
 Host: machine.503:%HTTPPORT\r
 Proxy-Authorization: Basic dGVzdDppbmc=\r
-Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>

diff --git a/tests/data/test523 b/tests/data/test523
index 9abe0ed2230c8391875f1a493034188eed3d270a..d021ae3be4c5c0f486ed7f9dd252c4d60e366014 100644 (file)
--- a/tests/data/test523
+++ b/tests/data/test523
@@ -54,7 +54,6 @@ GET HTTP://www.example.com:19999/523 HTTP/1.1
 Host: www.example.com:19999\r
 Authorization: Basic eHh4Onl5eQ==\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 <stdout>

diff --git a/tests/data/test540 b/tests/data/test540
index 8decaea9d09f63b7ef312bb4cbc36e401e567a14..19a13f19ef540a4a8e73073435a7597a31cf4cfa 100644 (file)
--- a/tests/data/test540
+++ b/tests/data/test540
@@ -78,19 +78,16 @@ http://test.remote.example.com/path/540 http://%HOSTIP:%HTTPPORT silly:person cu
 GET http://test.remote.example.com/path/540 HTTP/1.1\r
 Host: custom.set.host.name\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://test.remote.example.com/path/540 HTTP/1.1\r
 Host: custom.set.host.name\r
 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/540", response="ca507dcf189196b6a5374d3233042261"\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://test.remote.example.com/path/540 HTTP/1.1\r
 Host: custom.set.host.name\r
 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/540", response="ca507dcf189196b6a5374d3233042261"\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test547 b/tests/data/test547
index cee22c6f79849367442ae01731728c4d7ed1516b..7cf3e9197ad16bb6554b5705b750eb988a73f312 100644 (file)
--- a/tests/data/test547
+++ b/tests/data/test547
@@ -106,7 +106,6 @@ POST http://test.remote.example.com/path/547 HTTP/1.1
 Host: test.remote.example.com\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 36\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
@@ -116,7 +115,6 @@ Host: test.remote.example.com
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
@@ -125,7 +123,6 @@ Host: test.remote.example.com
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 36\r
 Content-Type: application/x-www-form-urlencoded\r
 \r

diff --git a/tests/data/test548 b/tests/data/test548
index 34cf5e2eacaa46fc6c4387f8af2f74147ded7f3b..e9d2262bbab4c512e978d4c1cc3564f12de32b8b 100644 (file)
--- a/tests/data/test548
+++ b/tests/data/test548
@@ -106,7 +106,6 @@ POST http://test.remote.example.com/path/548 HTTP/1.1
 Host: test.remote.example.com\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 36\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
@@ -116,7 +115,6 @@ Host: test.remote.example.com
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
@@ -125,7 +123,6 @@ Host: test.remote.example.com
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 36\r
 Content-Type: application/x-www-form-urlencoded\r
 \r

diff --git a/tests/data/test549 b/tests/data/test549
index a248edbf61cdda5e93eaef4508a7f002e3caf469..59925ce79b75bfb8396d791167539a34868abd53 100644 (file)
--- a/tests/data/test549
+++ b/tests/data/test549
@@ -55,7 +55,6 @@ ftp://www.example.com/moo/549 http://%HOSTIP:%HTTPPORT
 GET ftp://www.example.com/moo/549;type=i HTTP/1.1\r
 Host: www.example.com:21\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 <stdout>

diff --git a/tests/data/test550 b/tests/data/test550
index a609aa216d126aab345d78c81706f36749346d56..9a717ee87677747c696892882616b7be197e1bbb 100644 (file)
--- a/tests/data/test550
+++ b/tests/data/test550
@@ -55,7 +55,6 @@ ftp://www.example.com/moo/550 http://%HOSTIP:%HTTPPORT ascii
 GET ftp://www.example.com/moo/550;type=a HTTP/1.1\r
 Host: www.example.com:21\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 <stdout>

diff --git a/tests/data/test551 b/tests/data/test551
index ed6aee26431a3bddcbe34b56348afb53ac9d91a2..6dd0133752e873e15fffb5ac983c5396e34857fa 100644 (file)
--- a/tests/data/test551
+++ b/tests/data/test551
@@ -81,7 +81,6 @@ http://test.remote.example.com/path/551 http://%HOSTIP:%HTTPPORT s1lly:pers0n
 POST http://test.remote.example.com/path/551 HTTP/1.1\r
 Host: test.remote.example.com\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 36\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
@@ -90,7 +89,6 @@ POST http://test.remote.example.com/path/551 HTTP/1.1
 Host: test.remote.example.com\r
 Proxy-Authorization: Digest username="s1lly", realm="something fun to read", nonce="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", uri="/path/551", response="3325240726fbdaf1e61f3a0dd40b930c"\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 36\r
 Content-Type: application/x-www-form-urlencoded\r
 \r

diff --git a/tests/data/test552 b/tests/data/test552
index b44ca345514f15ea3e3becbe5ec82e789cad2026..c20e2049fc524fe093ab9b0fffef46841e291c21 100644 (file)
Binary files a/tests/data/test552 and b/tests/data/test552 differ

diff --git a/tests/data/test555 b/tests/data/test555
index 0f3bb07fcf80ee6e2025b07a97ea11bd6c612094..6c09e3c1bf0513a20785109cead110bf52d2188f 100644 (file)
--- a/tests/data/test555
+++ b/tests/data/test555
@@ -115,7 +115,6 @@ POST http://test.remote.example.com/path/555 HTTP/1.1
 Host: test.remote.example.com\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 36\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
@@ -125,7 +124,6 @@ Host: test.remote.example.com
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
@@ -134,7 +132,6 @@ Host: test.remote.example.com
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 Content-Length: 36\r
 Content-Type: application/x-www-form-urlencoded\r
 \r

diff --git a/tests/data/test561 b/tests/data/test561
index a6188eacfea2c256d087e8ce509a7d1a21257076..905e756b7b3eae5dc0af27a3f92793ed14a1e295 100644 (file)
--- a/tests/data/test561
+++ b/tests/data/test561
@@ -56,7 +56,6 @@ FTP RETR with CURLOPT_PROXY_TRANSFER_MODE, ASCII transfer and type=i
 GET ftp://www.example.com/moo/561;type=i HTTP/1.1\r
 Host: www.example.com:21\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 <stdout>

diff --git a/tests/data/test563 b/tests/data/test563
index 78515231979788ac6c7d3b59580094cde592333a..e4c00f50f4b58b70def96881523d0440e4f5d45c 100644 (file)
--- a/tests/data/test563
+++ b/tests/data/test563
@@ -50,7 +50,6 @@ ftp_proxy=http://%HOSTIP:%HTTPPORT/
 GET FTP://%HOSTIP:%FTPPORT/563;type=A HTTP/1.1\r
 Host: %HOSTIP:%FTPPORT\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test590 b/tests/data/test590
index 55ea4f0e934f78d8b2648472d91c5e4fdc32e99b..33417767664ea67c5ad34f07afe229f01e8ecaf6 100644 (file)
--- a/tests/data/test590
+++ b/tests/data/test590
@@ -104,21 +104,18 @@ GET http://test.remote.example.com/path/590 HTTP/1.1
 Host: test.remote.example.com\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://test.remote.example.com/path/590 HTTP/1.1\r
 Host: test.remote.example.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://test.remote.example.com/path/590 HTTP/1.1\r
 Host: test.remote.example.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAAAgACAPYAAAAIAAgA+AAAAAAAAAAAAAAABoKBAB3Hr6SDn3NDNkgebbaP88ExMjM0MjIzNFIW4N7aYT44bAIg1jt2blUBAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAbWVjdXJsaG9zdA==\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test63 b/tests/data/test63
index ccc19dd243aa3342e88206d59633f8683221c0a2..2a964492c17c4f6b9c869fa7f3effaec82aaaf93 100644 (file)
--- a/tests/data/test63
+++ b/tests/data/test63
@@ -45,7 +45,6 @@ GET http://we.want.that.site.com/63 HTTP/1.1
 Host: we.want.that.site.com\r
 Proxy-Authorization: Basic ZmFrZTp1c2Vy\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test79 b/tests/data/test79
index b2566e229e289c6420dd0f82fe8d15ec8b27ae1a..55fc2459f870cb0c43de6eac73d4e7b1f8676aea 100644 (file)
--- a/tests/data/test79
+++ b/tests/data/test79
@@ -48,7 +48,6 @@ ftp://%HOSTIP:%HTTPPORT/we/want/that/page/79 -x %HOSTIP:%HTTPPORT
 GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/79 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test80 b/tests/data/test80
index 147a6aa12455b11c2f47a9cf7e516d1e1b2765ad..8a635b45a6c949e3a01eb4dd827f217ac82b8cbd 100644 (file)
--- a/tests/data/test80
+++ b/tests/data/test80
@@ -68,7 +68,6 @@ CONNECT test.80:%HTTPPORT HTTP/1.0
 Host: test.80:%HTTPPORT\r
 Proxy-Authorization: Basic eW91YXJlOnlvdXJzZWxm\r
 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3\r
-Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>

diff --git a/tests/data/test81 b/tests/data/test81
index dc054d293a98c4021a42969e1ea38740b00b10d8..53affa05f4affa8e03f138854216a33ffdab6be0 100644 (file)
--- a/tests/data/test81
+++ b/tests/data/test81
@@ -89,14 +89,12 @@ Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 GET http://%HOSTIP:%HTTPPORT/81 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAACeAJ4AWAAAAAAAAAD2AAAACAAIAPYAAAAIAAgA/gAAAAAAAAAAAAAABoKBAL9LNW5+nkyHZRmyFaL/LJ4xMjM0MjIzNGUCyhgQ9hw6eWAT13EbDa0BAQAAAAAAAACAPtXesZ0BMTIzNDIyMzQAAAAAAgAEAEMAQwABABIARQBMAEkAUwBBAEIARQBUAEgABAAYAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAMALABlAGwAaQBzAGEAYgBlAHQAaAAuAGMAYwAuAGkAYwBlAGQAZQB2AC4AbgB1AAAAAAAAAAAAdGVzdHVzZXJjdXJsaG9zdA==\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test82 b/tests/data/test82
index 8b58f75da89bae4d6a0d07b7a112867906c468f6..de3fcbaeaaf9d997fbe7a21d3ab3fc69972440bc 100644 (file)
--- a/tests/data/test82
+++ b/tests/data/test82
@@ -49,7 +49,6 @@ Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
 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\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test83 b/tests/data/test83
index 120bcc6a1dd000302ed92f02d07e3e5674d432cc..4fe8ba34aae6c2c1d2db7830d5daa2a09d47fc7e 100644 (file)
--- a/tests/data/test83
+++ b/tests/data/test83
@@ -64,7 +64,6 @@ http://test.83:%HTTPPORT/we/want/that/page/83 -p -x %HOSTIP:%PROXYPORT --user 'i
 CONNECT test.83:%HTTPPORT HTTP/1.1\r
 Host: test.83:%HTTPPORT\r
 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3\r
-Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>

diff --git a/tests/data/test84 b/tests/data/test84
index 629dae2fca858ff4ace05ae227cab5f7883ccfc2..cf667d67a68bde1cd5f208906810933682edc72b 100644 (file)
--- a/tests/data/test84
+++ b/tests/data/test84
@@ -47,7 +47,6 @@ Host: %HOSTIP:%HTTPPORT
 Authorization: Basic aWFtOm15c2VsZg==\r
 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test85 b/tests/data/test85
index cb5e6e052ab11b0ece6b3b06f290bcde100923cd..a11363f50408397b20c0190436e8a66da9a9717a 100644 (file)
--- a/tests/data/test85
+++ b/tests/data/test85
@@ -51,7 +51,6 @@ Proxy-Authorization: Basic dGVzdGluZzp0aGlz
 Authorization: Basic aWFtOm15c2VsZg==\r
 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test93 b/tests/data/test93
index 138724835747aacdfd3cf43acaec075b490bf453..948d29c4d5ab788255b65e968793bb2db9166aeb 100644 (file)
--- a/tests/data/test93
+++ b/tests/data/test93
@@ -43,7 +43,6 @@ http://%HOSTIP:%HTTPPORT/93 -x %HOSTIP:%HTTPPORT
 GET http://%HOSTIP:%HTTPPORT/93 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test94 b/tests/data/test94
index 2f3f4824df9bb01d3d3982a72bea9296a2099356..94c894cb2d1f9a17b407501aa79e8f9ce0010162 100644 (file)
--- a/tests/data/test94
+++ b/tests/data/test94
@@ -51,7 +51,6 @@ https://test.anything.really.com:94 --proxy1.0 %HOSTIP:%HTTPPORT
 CONNECT test.anything.really.com:94 HTTP/1.0\r
 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\r
 Host: test.anything.really.com:94\r
-Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test95 b/tests/data/test95
index 1cd88acab63c2a573227c3cff54688cd54e42c96..2b3e2c22cf3568717f86588d48950d29c1671282 100644 (file)
--- a/tests/data/test95
+++ b/tests/data/test95
@@ -64,7 +64,6 @@ http://test.95:%HTTPPORT/we/want/that/page/95 -p -x %HOSTIP:%PROXYPORT -d "datat
 CONNECT test.95:%HTTPPORT HTTP/1.1\r
 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3\r
 Host: test.95:%HTTPPORT\r
-Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol nonewline="yes">