diff --git a/lib/http.c b/lib/http.c
index f61ce42c4504bce5caaf365c7b216fa15bb17394..84f357a9c2da1ac968c04555ea727926f537c21f 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -811,6 +811,8 @@ struct send_buffer {
 };
 typedef struct send_buffer send_buffer;
 
+static CURLcode add_custom_headers(struct connectdata *conn,
+                                   send_buffer *req_buffer);
 static CURLcode
  add_buffer(send_buffer *in, const void *inptr, size_t size);
 
@@ -885,34 +887,47 @@ CURLcode add_buffer_send(send_buffer *in,
 
     *bytes_written += amount;
 
-    if((size_t)amount != size) {
-      /* The whole request could not be sent in one system call. We must queue
-         it up and send it later when we get the chance. We must not loop here
-         and wait until it might work again. */
+    if(http) {
+      if((size_t)amount != size) {
+        /* The whole request could not be sent in one system call. We must
+           queue it up and send it later when we get the chance. We must not
+           loop here and wait until it might work again. */
 
-      size -= amount;
+        size -= amount;
 
-      ptr = in->buffer + amount;
+        ptr = in->buffer + amount;
 
-      /* backup the currently set pointers */
-      http->backup.fread = conn->fread;
-      http->backup.fread_in = conn->fread_in;
-      http->backup.postdata = http->postdata;
-      http->backup.postsize = http->postsize;
+        /* backup the currently set pointers */
+        http->backup.fread = conn->fread;
+        http->backup.fread_in = conn->fread_in;
+        http->backup.postdata = http->postdata;
+        http->backup.postsize = http->postsize;
 
-      /* set the new pointers for the request-sending */
-      conn->fread = (curl_read_callback)readmoredata;
-      conn->fread_in = (void *)conn;
-      http->postdata = ptr;
-      http->postsize = (curl_off_t)size;
+        /* set the new pointers for the request-sending */
+        conn->fread = (curl_read_callback)readmoredata;
+        conn->fread_in = (void *)conn;
+        http->postdata = ptr;
+        http->postsize = (curl_off_t)size;
 
-      http->send_buffer = in;
-      http->sending = HTTPSEND_REQUEST;
+        http->send_buffer = in;
+        http->sending = HTTPSEND_REQUEST;
 
-      return CURLE_OK;
+        return CURLE_OK;
+      }
+      http->sending = HTTPSEND_BODY;
+      /* the full buffer was sent, clean up and return */
+    }
+    else {
+      if((size_t)amount != size)
+        /* We have no continue-send mechanism now, fail. This can only happen
+           when this function is used from the CONNECT sending function. We
+           currently (stupidly) assume that the whole request is always sent
+           away in the first single chunk.
+
+           This needs FIXing.
+        */
+        return CURLE_SEND_ERROR;
     }
-    http->sending = HTTPSEND_BODY;
-    /* the full buffer was sent, clean up and return */
   }
   if(in->buffer)
     free(in->buffer);
@@ -1038,9 +1053,15 @@ Curl_compareheader(char *headerline,    /* line to check */
 }
 
 /*
- * ConnectHTTPProxyTunnel() requires that we're connected to a HTTP proxy. This
- * function will issue the necessary commands to get a seamless tunnel through
- * this proxy. After that, the socket can be used just as a normal socket.
+ * ConnectHTTPProxyTunnel() requires that we're connected to a HTTP
+ * proxy. This function will issue the necessary commands to get a seamless
+ * tunnel through this proxy. After that, the socket can be used just as a
+ * normal socket.
+ *
+ * This badly needs to be rewritten. CONNECT should be sent and dealt with
+ * like any ordinary HTTP request, and not specially crafted like this. This
+ * function only remains here like this for now since the rewrite is a bit too
+ * much work to do at the moment.
  */
 
 CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn,
@@ -1063,6 +1084,7 @@ CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn,
   char *line_start;
   char *host_port;
   curl_socket_t tunnelsocket = conn->sock[sockindex];
+  send_buffer *req_buffer;
 
 #define SELECT_OK      0
 #define SELECT_ERROR   1
@@ -1080,26 +1102,66 @@ CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn,
       conn->newurl = NULL;
     }
 
+    /* initialize a dynamic send-buffer */
+    req_buffer = add_buffer_init();
+
+    if(!req_buffer)
+      return CURLE_OUT_OF_MEMORY;
+
     host_port = aprintf("%s:%d", hostname, remote_port);
     if(!host_port)
       return CURLE_OUT_OF_MEMORY;
 
     /* Setup the proxy-authorization header, if any */
     result = Curl_http_output_auth(conn, (char *)"CONNECT", host_port, TRUE);
+
     if(CURLE_OK == result) {
+      char *host=(char *)"";
+      const char *proxyconn="";
+      char *ptr;
+
+      ptr = checkheaders(data, "Host:");
+      if(!ptr) {
+        host = aprintf("Host: %s\r\n", host_port);
+        if(!host)
+          result = CURLE_OUT_OF_MEMORY;
+      }
+      ptr = checkheaders(data, "Proxy-Connection:");
+      if(!ptr)
+        proxyconn = "Proxy-Connection: Keep-Alive\r\n";
 
-      /* OK, now send the connect request to the proxy */
-      result =
-        Curl_sendf(tunnelsocket, conn,
-                   "CONNECT %s:%d HTTP/1.0\015\012"
-                   "%s"
-                   "%s"
-                   "\r\n",
-                   hostname, remote_port,
-                   conn->allocptr.proxyuserpwd?
-                   conn->allocptr.proxyuserpwd:"",
-                   data->set.useragent?conn->allocptr.uagent:""
-                   );
+      if(CURLE_OK == result) {
+        /* Send the connect request to the proxy */
+        /* BLOCKING */
+        result =
+          add_bufferf(req_buffer,
+                      "CONNECT %s:%d HTTP/1.0\r\n"
+                      "%s"  /* Host: */
+                      "%s"  /* Proxy-Authorization */
+                      "%s"  /* User-Agent */
+                      "%s", /* Proxy-Connection */
+                      hostname, remote_port,
+                      host,
+                      conn->allocptr.proxyuserpwd?
+                      conn->allocptr.proxyuserpwd:"",
+                      data->set.useragent?conn->allocptr.uagent:"",
+                      proxyconn);
+
+        if(CURLE_OK == result)
+          result = add_custom_headers(conn, req_buffer);
+
+        if(host && *host)
+          free(host);
+
+        if(CURLE_OK == result)
+          /* CRLF terminate the request */
+          result = add_bufferf(req_buffer, "\r\n");
+
+        if(CURLE_OK == result)
+          /* Now send off the request */
+          result = add_buffer_send(req_buffer, conn,
+                                   &data->info.request_size);
+      }
       if(result)
         failf(data, "Failed sending CONNECT to proxy");
     }
@@ -1367,7 +1429,42 @@ static CURLcode expect100(struct SessionHandle *data,
   return result;
 }
 
+static CURLcode add_custom_headers(struct connectdata *conn,
+                                   send_buffer *req_buffer)
+{
+  CURLcode result = CURLE_OK;
+  char *ptr;
+  struct curl_slist *headers=conn->data->set.headers;
+
+  while(headers) {
+    ptr = strchr(headers->data, ':');
+    if(ptr) {
+      /* we require a colon for this to be a true header */
+
+      ptr++; /* pass the colon */
+      while(*ptr && isspace((int)*ptr))
+        ptr++;
 
+      if(*ptr) {
+        /* only send this if the contents was non-blank */
+
+        if(conn->allocptr.host &&
+           /* a Host: header was sent already, don't pass on any custom Host:
+              header as that will produce *two* in the same request! */
+           curl_strnequal("Host:", headers->data, 5))
+          ;
+        else {
+
+          result = add_bufferf(req_buffer, "%s\r\n", headers->data);
+          if(result)
+            return result;
+        }
+      }
+    }
+    headers = headers->next;
+  }
+  return result;
+}
 
 /*
  * Curl_http() gets called from the generic Curl_do() function when a HTTP
@@ -1620,8 +1717,10 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
   }
 
 
-  if(!checkheaders(data, "Pragma:"))
-    http->p_pragma = "Pragma: no-cache\r\n";
+  http->p_pragma =
+    (!checkheaders(data, "Pragma:") &&
+     (conn->bits.httpproxy && !conn->bits.tunnel_proxy) )?
+    "Pragma: no-cache\r\n":NULL;
 
   if(!checkheaders(data, "Accept:"))
     http->p_accept = "Accept: */*\r\n";
@@ -1727,7 +1826,6 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
       data->set.httpversion==CURL_HTTP_VERSION_1_0?"1.0":"1.1";
 
     send_buffer *req_buffer;
-    struct curl_slist *headers=data->set.headers;
     curl_off_t postsize; /* off_t type to be able to hold a large file size */
 
     /* initialize a dynamic send-buffer */
@@ -1750,6 +1848,7 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
                   "%s" /* accept */
                   "%s" /* accept-encoding */
                   "%s" /* referer */
+                  "%s" /* Proxy-Connection */
                   "%s",/* transfer-encoding */
 
                 request,
@@ -1768,6 +1867,8 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
                 (data->set.encoding && *data->set.encoding && conn->allocptr.accept_encoding)?
                 conn->allocptr.accept_encoding:"",
                 (data->change.referer && conn->allocptr.ref)?conn->allocptr.ref:"" /* Referer: <data> */,
+                (conn->bits.httpproxy && !conn->bits.tunnel_proxy)?
+                  "Proxy-Connection: Keep-Alive\r\n":"",
                 te
                 );
 
@@ -1874,33 +1975,9 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
         return result;
     }
 
-    while(headers) {
-      ptr = strchr(headers->data, ':');
-      if(ptr) {
-        /* we require a colon for this to be a true header */
-
-        ptr++; /* pass the colon */
-        while(*ptr && isspace((int)*ptr))
-          ptr++;
-
-        if(*ptr) {
-          /* only send this if the contents was non-blank */
-
-          if(conn->allocptr.host &&
-            /* a Host: header was sent already, don't pass on any custom Host:
-               header as that will produce *two* in the same request! */
-             curl_strnequal("Host:", headers->data, 5))
-            ;
-          else {
-
-            result = add_bufferf(req_buffer, "%s\r\n", headers->data);
-            if(result)
-              return result;
-          }
-        }
-      }
-      headers = headers->next;
-    }
+    result = add_custom_headers(conn, req_buffer);
+    if(result)
+      return result;
 
     http->postdata = NULL;  /* nothing to post at this point */
     Curl_pgrsSetUploadSize(data, 0); /* upload size is 0 atm */
diff --git a/tests/data/test1 b/tests/data/test1
index 93a0f56263b9c6eed584ac8fd25b170b7852f043..6f88024cffe433f2aaf43082ecef825d270d74d2 100644
--- a/tests/data/test1
+++ b/tests/data/test1
@@ -47,7 +47,6 @@ http://%HOSTIP:%HTTPPORT/1
 <protocol>
 GET /1 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test10 b/tests/data/test10
index a536d4eea6a267c3db3b44f0390c6fad482c9327..f9fcbd717744d18138656ba02e7b0d39b70c3f13 100644
--- a/tests/data/test10
+++ b/tests/data/test10
@@ -48,7 +48,6 @@ the
 <protocol>
 PUT /we/want/10 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 78
 Expect: 100-continue
diff --git a/tests/data/test11 b/tests/data/test11
index f304f523d0ef3bd4b54ccab4b691942dc438377e..e34a36646624b45eb8ce7b1824f2cde8baa2f9b0 100644
--- a/tests/data/test11
+++ b/tests/data/test11
@@ -62,12 +62,10 @@ http://%HOSTIP:%HTTPPORT/want/11 -L
 <protocol>
 GET /want/11 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /want/data/110002.txt?coolsite=yes HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test12 b/tests/data/test12
index 151ddb02c6c03996eb59f98f7751743a44acece5..e49676a209eb7050794ea8a2fb03a906f062c6c0 100644
--- a/tests/data/test12
+++ b/tests/data/test12
@@ -47,7 +47,6 @@ http://%HOSTIP:%HTTPPORT/want/12 -r 100-200
 GET /want/12 HTTP/1.1
 Range: bytes=100-200
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test13 b/tests/data/test13
index 7d247b25f15bafa7e4665252267162aff3164393..3af6ff9b9c4cf3a4544a1481cd02398a5011ff61 100644
--- a/tests/data/test13
+++ b/tests/data/test13
@@ -36,7 +36,6 @@ http://%HOSTIP:%HTTPPORT/want/13 -X DELETE
 <protocol>
 DELETE /want/13 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test14 b/tests/data/test14
index 3e07e69e68d7d46d6f7d11ddae5f03b17dfa2410..f10c6f488a9e5284c5b4d2d52bdbc9fc13cf5f05 100644
--- a/tests/data/test14
+++ b/tests/data/test14
@@ -36,7 +36,6 @@ http://%HOSTIP:%HTTPPORT/want/14 -i --head
 HEAD /want/14 HTTP/1.1
 User-Agent: curl/7.4.2-pre4 (sparc-sun-solaris2.7) libcurl 7.4.2-pre4
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test15 b/tests/data/test15
index a3c557e92e0acf3e6238e64c7c99abe1dfefe7d3..e0a82826f8a729e92a2e902312bc5daf92a41b23 100644
--- a/tests/data/test15
+++ b/tests/data/test15
@@ -49,7 +49,6 @@ http://127.0.0.1:%HTTPPORT/want/15 200 26
 <protocol>
 GET /want/15 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test150 b/tests/data/test150
index 4afa7c22b73a1fbf344938fb44f0fdf5df379176..301c0eb43b3661cb9867e5f8f5a4a97be50c1c60 100644
--- a/tests/data/test150
+++ b/tests/data/test150
@@ -67,14 +67,12 @@ GET /150 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /150 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAYABgAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAAB4AAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FBqYVyF4y6/y/7F6qmEQ7lXjXFF3tH1145
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test151 b/tests/data/test151
index c32d2d8a63cc911b4d5beb95ae79e8b3f093f6fd..82a0e108d8f9f47ed42e8e010a77bddd1e7a970e 100644
--- a/tests/data/test151
+++ b/tests/data/test151
@@ -33,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/151
 GET /151 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test152 b/tests/data/test152
index aaee6a41b7f63c025588506f710777ea5fefd8f2..12ba29c98c24183b65f440364eefb4e7f185fcfe 100644
--- a/tests/data/test152
+++ b/tests/data/test152
@@ -33,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/152 --fail
 GET /152 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test153 b/tests/data/test153
index 8acde6011c072165b5d54c43b8df096693eb6df2..1fd54a1f90b6a3fcdadd1bec4185b28a03adc446 100644
--- a/tests/data/test153
+++ b/tests/data/test153
@@ -69,28 +69,24 @@ http://%HOSTIP:%HTTPPORT/1530001 -u testuser:testpass --digest http://%HOSTIP:%H
 <protocol>
 GET /1530001 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /1530001 HTTP/1.1
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1530001", response="f4f83139396995bac665f24a1f1055c7"
 User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /1530002 HTTP/1.1
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1530002", response="f84511b014fdd0ba6494f42871079c32"
 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 GSS
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /1530002 HTTP/1.1
 Authorization: Digest username="testuser", realm="testrealm", nonce="999999", uri="/1530002", cnonce="MTA4MzIy", nc="00000001", qop="auth", response="25291c357671604a16c0242f56721c07", algorithm="MD5"
 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 GSS
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test154 b/tests/data/test154
index 010137ecefa7dc37acfc8eebef00eb2c6d35b6ce..e3d8770828746cdf1d9f0eeeb40f65d82a44e30a 100644
--- a/tests/data/test154
+++ b/tests/data/test154
@@ -74,7 +74,6 @@ four is the number of lines
 <protocol>
 PUT /154 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 85
 Expect: 100-continue
@@ -83,7 +82,6 @@ PUT /154 HTTP/1.1
 Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/154", response="b71551e12d1c456e47d8388ecb2edeca"
 User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 85
 Expect: 100-continue
diff --git a/tests/data/test155 b/tests/data/test155
index 62d680e18b6d6a3df920cae355eb21897aa6b3c0..57826c828a7fed8e2b3e03b4602c7bd1590d2cd1 100644
--- a/tests/data/test155
+++ b/tests/data/test155
@@ -91,7 +91,6 @@ four is the number of lines
 <protocol>
 PUT /155 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 85
 Expect: 100-continue
@@ -99,7 +98,6 @@ Expect: 100-continue
 PUT /155 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 0
 Expect: 100-continue
@@ -108,7 +106,6 @@ PUT /155 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAYABgAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAAB4AAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FBqYVyF4y6/y/7F6qmEQ7lXjXFF3tH1145
 User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 85
 Expect: 100-continue
diff --git a/tests/data/test156 b/tests/data/test156
index 0ff9fd10ec096e7e03243c8b1ea6c3a99ec79153..67deb08eedbde959b86b960612b8a30a6dcc46e8 100644
--- a/tests/data/test156
+++ b/tests/data/test156
@@ -38,7 +38,6 @@ four is the number of lines
 PUT /156 HTTP/1.1
 User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 85
 Expect: 100-continue
diff --git a/tests/data/test157 b/tests/data/test157
index c48d36fad87b9055bd912eee24164f4044c386e4..67cf26c95b2773ad0fec5d3e6d81de360c049499 100644
--- a/tests/data/test157
+++ b/tests/data/test157
@@ -31,7 +31,6 @@ http://%HOSTIP:%HTTPPORT/157 -u testuser:testpass --anyauth
 <protocol>
 GET /157 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test158 b/tests/data/test158
index 463b7a5a470ba62c976371adfcd7bd8a730ff9f1..f3aaa7ebb5cb50009b5b5f722af47f1983e26922 100644
--- a/tests/data/test158
+++ b/tests/data/test158
@@ -31,7 +31,6 @@ http://%HOSTIP:%HTTPPORT/158 -F name=daniel
 POST /158 HTTP/1.1
 User-Agent: curl/7.11.2-CVS (i686-pc-linux-gnu) libcurl/7.11.2-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 145
 Expect: 100-continue
diff --git a/tests/data/test159 b/tests/data/test159
index 1fd60c5a7a85447f379bfef7be0d88918e2e7c62..007a10c608b624a20094ec71180156897ac3354d 100644
--- a/tests/data/test159
+++ b/tests/data/test159
@@ -67,14 +67,12 @@ GET /159 HTTP/1.0
 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /159 HTTP/1.0
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAYABgAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAAB4AAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FBqYVyF4y6/y/7F6qmEQ7lXjXFF3tH1145
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test16 b/tests/data/test16
index b7c3d5d357034fc89780edb95fcf892c0b391944..7d2a8b4061f9334d6121c35d63f7ddf88072aa77 100644
--- a/tests/data/test16
+++ b/tests/data/test16
@@ -43,6 +43,7 @@ Proxy-Authorization: Basic ZmFrZUB1c2VyOqenp2xvb29vb29vb29vb29vb29vb29vb29vb29vb
 Host: we.want.that.site.com
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test160 b/tests/data/test160
index 18f3dece559794890065874e432c2e12d8cd0539..c831cce1f0e3d63b23178ef44af93068869c81af 100644
--- a/tests/data/test160
+++ b/tests/data/test160
@@ -54,12 +54,10 @@ surprise2
 <protocol>
 GET /want/160 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /wantmore/1600001 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test162 b/tests/data/test162
index 03ffc02d0f8ef6fd53d292722615f6da61280885..679832b7f95c479e7932537e9b77f35945d22e49 100644
--- a/tests/data/test162
+++ b/tests/data/test162
@@ -40,6 +40,7 @@ User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0
 Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 <errorcode>
diff --git a/tests/data/test163 b/tests/data/test163
index 6712e24eada222afa41f4474996ab26fcb62da88..c51adfccbe5590995b9c78da96ef3b028a8f55b6 100644
--- a/tests/data/test163
+++ b/tests/data/test163
@@ -43,7 +43,6 @@ yes please
 POST /we/want/163 HTTP/1.1
 User-Agent: curl/7.11.2-CVS (i686-pc-linux-gnu) libcurl/7.11.2-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.0.0
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 304
 Expect: 100-continue
diff --git a/tests/data/test164 b/tests/data/test164
index 10d5fd657aa9b8b99329e8b35ec7a1fda3a39af1..3aa03c4819f1b7d3b0289c9ce2ef575791f7c030 100644
--- a/tests/data/test164
+++ b/tests/data/test164
@@ -52,7 +52,6 @@ http://%HOSTIP:%HTTPPORT/want/164 -r 0-10,12-15
 GET /want/164 HTTP/1.1
 Range: bytes=0-10,12-15
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test165 b/tests/data/test165
index 4945dace53e63d2c18d7e6bbb9b8814f75b7bb26..20ef32d38d146d1a24aaf03cb1a08b7fae3d7746 100644
--- a/tests/data/test165
+++ b/tests/data/test165
@@ -42,6 +42,7 @@ GET http://www.xn--4cab6c.se/page/165 HTTP/1.1
 Host: www.xn--4cab6c.se
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test166 b/tests/data/test166
index 9a9704b0e3c2cfde22e39f46055526e440b2e02f..edc184abf07fef16136735dfb8caec9e2706b566 100644
--- a/tests/data/test166
+++ b/tests/data/test166
@@ -35,7 +35,6 @@ data inside the file
 POST /we/want/166 HTTP/1.1
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 223
 Expect: 100-continue
diff --git a/tests/data/test167 b/tests/data/test167
index 58ced40617e7a08ee119f28a5da1b0e590c10081..a23d94ba7a698deb13b4597f81615541ad29e086 100644
--- a/tests/data/test167
+++ b/tests/data/test167
@@ -49,6 +49,7 @@ User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6
 Host: data.from.server.requiring.digest.hohoho.com
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://data.from.server.requiring.digest.hohoho.com/167 HTTP/1.1
 Proxy-Authorization: Basic Zm9vOmJhcg==
@@ -57,6 +58,7 @@ User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6
 Host: data.from.server.requiring.digest.hohoho.com
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test168 b/tests/data/test168
index 80f37ac2585d598d014fb9d5340700a59d3ad0c0..dbaf667c942112635fc9bbdfb1c52accf6af889f 100644
--- a/tests/data/test168
+++ b/tests/data/test168
@@ -62,6 +62,7 @@ User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6
 Host: data.from.server.requiring.digest.hohoho.com
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1
 Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/168", response="fb8608e00ad9239a3dedb14bc8575976"
@@ -69,6 +70,7 @@ User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6
 Host: data.from.server.requiring.digest.hohoho.com
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1
 Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/168", response="fb8608e00ad9239a3dedb14bc8575976"
@@ -77,6 +79,7 @@ User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6
 Host: data.from.server.requiring.digest.hohoho.com
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test169 b/tests/data/test169
index 3ae9e90483fd418e942afe78b37d860b73bbc06b..3f377f40102be5b6dcef7bdec3a182257a02f8cb 100644
--- a/tests/data/test169
+++ b/tests/data/test169
@@ -87,6 +87,7 @@ User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6
 Host: data.from.server.requiring.digest.hohoho.com
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEMAAAAYABgAWwAAAAAAAABAAAAAAwADAEAAAAAAAAAAQwAAAAAAAABzAAAAAYIAAGZvb4P6B+XVQ6vQsx3DfDXUVhd9436GAxPu0IYcl2Z7LxHmNeOAWQ+vxUmhuCFJBUgXCQ==
@@ -94,6 +95,7 @@ User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6
 Host: data.from.server.requiring.digest.hohoho.com
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1
 Authorization: Digest username="digest", realm="r e a l m", nonce="abcdef", uri="/169", response="95d48591985a03c4b49cb962aa7bd3e6"
@@ -101,6 +103,7 @@ User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6
 Host: data.from.server.requiring.digest.hohoho.com
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test17 b/tests/data/test17
index 25de5d4bb8ab97d5f26ba9cd4a7b27ceae0d5088..54c5910841e82367d9119aa489bc60c04c5c87b1 100644
--- a/tests/data/test17
+++ b/tests/data/test17
@@ -46,7 +46,6 @@ request MOOO
 MOOO /that.site.com/17 HTTP/1.1
 User-Agent: agent007 license to drill	
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test170 b/tests/data/test170
index d8c6494d06643ffd4442474f0d6dff7d5c3596fd..9f42f1ea5b29779f3573188183b1c6a4d94b322f 100644
--- a/tests/data/test170
+++ b/tests/data/test170
@@ -30,6 +30,7 @@ User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6
 Host: a.galaxy.far.far.away
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 0
 
 </protocol>
diff --git a/tests/data/test171 b/tests/data/test171
index 26bbf2e7f4e40f6eda5834dd546b157d705415db..090cd1981336e53e063f3e0b97a6d8143ae15082 100644
--- a/tests/data/test171
+++ b/tests/data/test171
@@ -35,6 +35,7 @@ GET http://z.x.com/171 HTTP/1.1
 Host: z.x.com
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 <file name="log/jar171">
diff --git a/tests/data/test172 b/tests/data/test172
index 513e44cd26c82659571e2f6dbc99ac95dcb16eff..8ad96787adf3158cfe31db71276d4127a5e0764d 100644
--- a/tests/data/test172
+++ b/tests/data/test172
@@ -39,7 +39,6 @@ http://%HOSTIP:%HTTPPORT/we/want/172 -b log/jar172.txt -b "tool=curl; name=fool"
 <protocol>
 GET /we/want/172 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Cookie: nodomain=value; partmatch=present; tool=curl; name=fool
 
diff --git a/tests/data/test173 b/tests/data/test173
index 8d668dd3553a677be40a72ca8cfffd2364b61701..130fa9e075c94abe35a2840722d0a20ce5a813f8 100644
--- a/tests/data/test173
+++ b/tests/data/test173
@@ -43,7 +43,6 @@ line8
 POST /we/want/173 HTTP/1.1
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 359
 Expect: 100-continue
diff --git a/tests/data/test174 b/tests/data/test174
index 4b8795bab9c51ccff50e98ead42fd39ca0db1516..32130f1be2fa0c950a9e59d03bb00a5821b8d618 100644
--- a/tests/data/test174
+++ b/tests/data/test174
@@ -33,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/174 -u testuser:testpass --anyauth -d "junkelijunk"
 POST /174 HTTP/1.1
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 11
 Content-Type: application/x-www-form-urlencoded
diff --git a/tests/data/test175 b/tests/data/test175
index e8891926ae6926c68308a6f84e6b95ca42528074..3a979af983680d170647d9bee52665d64a67e090 100644
--- a/tests/data/test175
+++ b/tests/data/test175
@@ -55,7 +55,6 @@ http://%HOSTIP:%HTTPPORT/175 -u auser:apasswd --digest -d "junkelijunk"
 POST /175 HTTP/1.1
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
@@ -63,7 +62,6 @@ Content-Type: application/x-www-form-urlencoded
 POST /175 HTTP/1.1
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 11
 Content-Type: application/x-www-form-urlencoded
diff --git a/tests/data/test176 b/tests/data/test176
index 2fed0ededf0b9c2209eb6e17990df0c761e26641..82f5574d9ebfedafb9961f5d9311b88065d3bec7 100644
--- a/tests/data/test176
+++ b/tests/data/test176
@@ -59,7 +59,6 @@ POST /176 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
@@ -67,7 +66,6 @@ Content-Type: application/x-www-form-urlencoded
 POST /176 HTTP/1.1
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 11
 Content-Type: application/x-www-form-urlencoded
diff --git a/tests/data/test177 b/tests/data/test177
index 2d7d04c80ef81fa0048b9f58e8c5fff273ba782f..989eeb146f6cf4d37c29b9ca7a19a9b40a0a01e0 100644
--- a/tests/data/test177
+++ b/tests/data/test177
@@ -32,7 +32,6 @@ http://%HOSTIP:%HTTPPORT/177 -u auser:apasswd --digest -d "junkelijunk"
 POST /177 HTTP/1.1
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
diff --git a/tests/data/test178 b/tests/data/test178
index 45bb9a2e74f1debaf43a41a366da7d01b474d16c..efb56c0a4eb9353c0dcd6848168c35458358b912 100644
--- a/tests/data/test178
+++ b/tests/data/test178
@@ -35,7 +35,6 @@ http://%HOSTIP:%HTTPPORT/178
 <protocol>
 GET /178 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test179 b/tests/data/test179
index edef6bbd5004bb3ccb5678362c0e77181dd9f0e6..6d2249ee18c9f7abea1845aeb103965af1ac075b 100644
--- a/tests/data/test179
+++ b/tests/data/test179
@@ -40,6 +40,7 @@ GET http://supertrooper.fake/c/179 HTTP/1.1
 Host: supertrooper.fake
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 Cookie: moo2=indeed
 
 </protocol>
diff --git a/tests/data/test18 b/tests/data/test18
index 283cbe2b12b2fd14e9bef8ee4a89645c328bbcb2..d235ffa412910f8df4118ca3526033d9d1411c9a 100644
--- a/tests/data/test18
+++ b/tests/data/test18
@@ -52,19 +52,16 @@ multiple requests using {} in URL
 GET /18 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /180002 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /180003 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test180 b/tests/data/test180
index d76d6377902e56aa2ac4dfc1606d6b685a86c53e..5477bcc2808378bf4e14915066dcad422c0a47ca 100644
--- a/tests/data/test180
+++ b/tests/data/test180
@@ -41,7 +41,6 @@ the
 <protocol>
 PUT /we/want/180 HTTP/1.0
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 78
 
diff --git a/tests/data/test181 b/tests/data/test181
index 15d9d2a8dd5834ef125cc4ae866caab014c870ef..76fb32c7ce22e308edd1a8ffb0f7e3866906c443 100644
--- a/tests/data/test181
+++ b/tests/data/test181
@@ -41,7 +41,6 @@ the
 <protocol>
 POST /we/want/181 HTTP/1.0
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 79
 Content-Type: application/x-www-form-urlencoded
diff --git a/tests/data/test183 b/tests/data/test183
index 149eeb44726238ecccb5ca51404552c4018912c1..f7e54fa3416d2633c08286be79d9d50a75b0d86f 100644
--- a/tests/data/test183
+++ b/tests/data/test183
@@ -36,12 +36,14 @@ User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.6
 Host: deathstar.another.galaxy
 Pragma: no-cache
 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
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 
diff --git a/tests/data/test184 b/tests/data/test184
index 3ce1861628b31544738a0ab8d9d7ce559dfd3613..cd8de6315f809352e312e376d5e9a203fae7ce24 100644
--- a/tests/data/test184
+++ b/tests/data/test184
@@ -55,12 +55,14 @@ GET http://deathstar.another.galaxy/184 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
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 Host: another.visitor.stay.a.while.stay.foreeeeeever
 
 GET http://yet.another.host/184 HTTP/1.1
 Host: yet.another.host
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 
diff --git a/tests/data/test185 b/tests/data/test185
index 890a1abb6fd012b08d66dcae3bcb581415fe9121..9799c61c700d0b8196950aa731f355c8a75856c2 100644
--- a/tests/data/test185
+++ b/tests/data/test185
@@ -55,11 +55,13 @@ GET http://deathstar.another.galaxy/185 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
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 Host: another.visitor.stay.a.while.stay.foreeeeeever
 
 GET http://deathstar.another.galaxy/go/west/185 HTTP/1.1
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 Host: another.visitor.stay.a.while.stay.foreeeeeever
 
 </protocol>
diff --git a/tests/data/test186 b/tests/data/test186
index 1450d4e6b619ef92e512717d20bb9c27158415d6..e878bca80951d1e37b4a5da632c75bd4c099b4f4 100644
--- a/tests/data/test186
+++ b/tests/data/test186
@@ -33,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/we/want/186 -F "name=daniel;type=moo/foo" -F "html= <bo
 POST /we/want/186 HTTP/1.1
 User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.7d zlib/1.2.1.1 c-ares/1.2.0 libidn/0.5.2
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 305
 Expect: 100-continue
diff --git a/tests/data/test187 b/tests/data/test187
index 28405d2ad414b08a66d2d9e328d51bf2e15a6156..67aace5d1db7023c59a95f4c0c8522b3fea6e2bb 100644
--- a/tests/data/test187
+++ b/tests/data/test187
@@ -55,12 +55,10 @@ http://%HOSTIP:%HTTPPORT?oh=what-weird=test/187 -L
 <protocol>
 GET /?oh=what-weird=test/187 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /root/1870002.txt?coolsite=yes HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test188 b/tests/data/test188
index e61cb9d98a9cf8354c9aa68b2cffcd7129706915..f6eded22bda43e4a78ccef7005f6ecf75de2ac86 100644
--- a/tests/data/test188
+++ b/tests/data/test188
@@ -54,14 +54,12 @@ GET /188 HTTP/1.1
 Range: bytes=50-
 User-Agent: curl/7.6 (sparc-sun-solaris2.7) libcurl 7.6-pre4 (SSL 0.9.6) (krb4 enabled)
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /188 HTTP/1.1
 Range: bytes=50-
 User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.7d zlib/1.2.1.2 libidn/0.5.2
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test189 b/tests/data/test189
index 5358823302fc9632d8a60d28af95e310dc98b6b3..1885c57e404026f700c293680ee06c12af094689 100644
--- a/tests/data/test189
+++ b/tests/data/test189
@@ -51,14 +51,12 @@ GET /189 HTTP/1.1
 Range: bytes=50-
 User-Agent: curl/7.6 (sparc-sun-solaris2.7) libcurl 7.6-pre4 (SSL 0.9.6) (krb4 enabled)
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /189 HTTP/1.1
 Range: bytes=50-
 User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.7d zlib/1.2.1.2 libidn/0.5.2
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test192 b/tests/data/test192
index 0973cdb6d08ddab4cdb751f232ccad3dba68a3d1..e29cdcbc758cd63d10e219e3aac3d3b84e178fd6 100644
--- a/tests/data/test192
+++ b/tests/data/test192
@@ -34,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/192 -w '%{num_connects}\n'
 <protocol>
 GET /192 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test193 b/tests/data/test193
index 0d7cbc58ebc57d970ce086c7889a52adc239e537..7c53de6c8809b50a1efb2d4b1e69ac5aaa9996d0 100644
--- a/tests/data/test193
+++ b/tests/data/test193
@@ -44,12 +44,10 @@ http://%HOSTIP:%HTTPPORT/193 -w '%{num_connects}\n' -L
 <protocol>
 GET /193 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /193 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test194 b/tests/data/test194
index 4e6e0f386f33ab9eb9e3d4cb86be60037f431392..9842551ce3ccbd3556855addbc8d348e5c209240 100644
--- a/tests/data/test194
+++ b/tests/data/test194
@@ -38,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/want/194 -C 87 --fail
 GET /want/194 HTTP/1.1
 Range: bytes=87-
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test197 b/tests/data/test197
index 2f73e8e925a597f207d4c37e932bff8c061cf356..59ee26029439a52486b15305e71e8d799a31eed4 100644
--- a/tests/data/test197
+++ b/tests/data/test197
@@ -42,12 +42,10 @@ http://%HOSTIP:%HTTPPORT/197 --retry 1000
 <protocol>
 GET /197 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /197 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test198 b/tests/data/test198
index 90d52ded38a4bbbb3629eeb50e04bf1d2cf5f8f0..51d0e6f020c38dac6151465ace3801b747b0785f 100644
--- a/tests/data/test198
+++ b/tests/data/test198
@@ -51,12 +51,10 @@ http://%HOSTIP:%HTTPPORT/198 --retry 1000
 <protocol>
 GET /198 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /198 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test199 b/tests/data/test199
index 875815eb4dea606be5621054907544733e1599c3..2b2b435df1b860e8385e93f5f7eff624bb628744 100644
--- a/tests/data/test199
+++ b/tests/data/test199
@@ -40,12 +40,10 @@ HTTP with -d, -G and {}
 <protocol>
 GET /199?foo=moo&moo=poo HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /199?foo=moo&moo=poo HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test2 b/tests/data/test2
index e2aedff7bc31dfc8b04a7286cb83ad481f3c50d3..c701e79ba045738d39e55de831ffef7c49625355 100644
--- a/tests/data/test2
+++ b/tests/data/test2
@@ -42,7 +42,6 @@ HTTP GET with user and password
 GET /2 HTTP/1.1
 Authorization: Basic ZmFrZTp1c2Vy
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test206 b/tests/data/test206
index 7bcba288e51c250dbd831b5c2b64465d7c60dab3..b60393dfea7ac1ba2d6c396e8378c7bf0aab9ea9 100644
--- a/tests/data/test206
+++ b/tests/data/test206
@@ -67,14 +67,17 @@ http://test.remote.server.com:206/path/2060002 --proxy http://%HOSTIP:%HTTPPORT
 </strip>
 <protocol>
 CONNECT test.remote.server.com:206 HTTP/1.0
+Host: test.remote.server.com:206
+Proxy-Connection: Keep-Alive
 
 CONNECT test.remote.server.com:206 HTTP/1.0
+Host: test.remote.server.com:206
 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.server.com:206", response="5059a96c954981ceb94e17d667c8d3f8"
+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
 Host: test.remote.server.com:206
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test207 b/tests/data/test207
index f40ecf05ca09eb3f64364abbf4045ad3d5cc3165..48d556d7e20dc2331d4e74060717a314bf73607b 100644
--- a/tests/data/test207
+++ b/tests/data/test207
@@ -44,7 +44,6 @@ http://%HOSTIP:%HTTPPORT/207
 <protocol>
 GET /207 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test208 b/tests/data/test208
index 2a4669c1394a5ec9b8795f2a9e7059b841f3cc51..d57b79fd8524ee80f2b995422403afd95eb28fb6 100644
--- a/tests/data/test208
+++ b/tests/data/test208
@@ -45,6 +45,7 @@ Authorization: Basic ZGFuaWVsOm15c2VjcmV0
 Host: host.com:21
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 78
 Expect: 100-continue
 
diff --git a/tests/data/test209 b/tests/data/test209
index e915ddd73b43e3ca23827da0b5dd0e9d5743affa..bc699fb4adeb7c9354ae1d3d3037d833f847c4be 100644
--- a/tests/data/test209
+++ b/tests/data/test209
@@ -80,15 +80,18 @@ http://test.remote.server.com:209/path/2090002 --proxy http://%HOSTIP:%HTTPPORT
 </strip>
 <protocol>
 CONNECT test.remote.server.com:209 HTTP/1.0
+Host: test.remote.server.com:209
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
+Proxy-Connection: Keep-Alive
 
 CONNECT test.remote.server.com:209 HTTP/1.0
+Host: test.remote.server.com:209
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEUAAAAYABgAXQAAAAAAAABAAAAABQAFAEAAAAAAAAAARQAAAAAAAAB1AAAAAYIAAHNpbGx5oB5CPMq0JDu5tbxLow3sHn3jfoYDE+7QJVE7DA0GyDEwvj2BxsBctP9tT4fnCtL1
+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
 Host: test.remote.server.com:209
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test213 b/tests/data/test213
index 6ec4933fc6e3bc1e26d4468aa24c68d43711a186..836fdd36d969b47617b4d86ed6deb5a5194c5e29 100644
--- a/tests/data/test213
+++ b/tests/data/test213
@@ -80,15 +80,18 @@ http://test.remote.server.com:213/path/2130002 --proxy http://%HOSTIP:%HTTPPORT
 </strip>
 <protocol nonewline=yes>
 CONNECT test.remote.server.com:213 HTTP/1.0
+Host: test.remote.server.com:213
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
+Proxy-Connection: Keep-Alive
 
 CONNECT test.remote.server.com:213 HTTP/1.0
+Host: test.remote.server.com:213
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEUAAAAYABgAXQAAAAAAAABAAAAABQAFAEAAAAAAAAAARQAAAAAAAAB1AAAAAYIAAHNpbGx5oB5CPMq0JDu5tbxLow3sHn3jfoYDE+7QJVE7DA0GyDEwvj2BxsBctP9tT4fnCtL1
+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
 Host: test.remote.server.com:213
-Pragma: no-cache
 Accept: */*
 Content-Length: 6
 Content-Type: application/x-www-form-urlencoded
diff --git a/tests/data/test214 b/tests/data/test214
index 8a7405b451c976795d8f0a36b64aeb23346a4931..f79f48520345e106b24a212900bdd74d318049d2 100644
--- a/tests/data/test214
+++ b/tests/data/test214
@@ -35,7 +35,6 @@ HTTP URL with escaped { and }
 <protocol>
 GET /{}\/214 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test217 b/tests/data/test217
index 82c8b150b9213552beec20e485585f6e3e7cf247..c74ac9cb5e56542d3d85482e01fc361f44d9e4c6 100644
--- a/tests/data/test217
+++ b/tests/data/test217
@@ -30,6 +30,8 @@ http://test.remote.server.com:217/path/2170002 --proxy http://%HOSTIP:%HTTPPORT
 </strip>
 <protocol>
 CONNECT test.remote.server.com:217 HTTP/1.0
+Host: test.remote.server.com:217
+Proxy-Connection: Keep-Alive
 
 </protocol>
 # CURLE_RECV_ERROR
diff --git a/tests/data/test218 b/tests/data/test218
index 73f193a38cd4b6c3037c5f2db34427e3c1e27b17..bcf5d7a472d413e95c3cc3f7cc1f0d136d9ae388 100644
--- a/tests/data/test218
+++ b/tests/data/test218
@@ -37,7 +37,6 @@ just some tiny teeny contents
 <protocol>
 PUT /218 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Transfer-Encoding: chunked
 Expect: 100-continue
diff --git a/tests/data/test22 b/tests/data/test22
index f2f16066b09fcf0fd6206058315336fdf79d9b87..206e5f3dd4f1c04d67998d0cbb4cd79dfe717ad6 100644
--- a/tests/data/test22
+++ b/tests/data/test22
@@ -38,7 +38,6 @@ get HTTP with URL > 10000 bytes
 GET /aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/22 HTTP/1.1
 User-Agent: curl/7.4.2 (sparc-sun-solaris2.7) libcurl 7.4.2 (SSL 0.9.6)
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol
diff --git a/tests/data/test220 b/tests/data/test220
index 7cde3d7509621cf9d0e77da6e3d7d00a4670e30e..87138cf5d6e64d960488a6fa1580a5ac0238e50f 100644
--- a/tests/data/test220
+++ b/tests/data/test220
@@ -52,7 +52,6 @@ http://%HOSTIP:%HTTPPORT/220 --compressed
 <protocol>
 GET /220 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Accept-Encoding: deflate, gzip
 
diff --git a/tests/data/test221 b/tests/data/test221
index c07fb58f22e28d20a8e97ab81bf6bc534cae12b3..2ea9ea94d19c049496f9ece32c0f234ce9f6f8b4 100644
--- a/tests/data/test221
+++ b/tests/data/test221
@@ -51,7 +51,6 @@ http://%HOSTIP:%HTTPPORT/221 --compressed
 <protocol>
 GET /221 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Accept-Encoding: deflate, gzip
 
diff --git a/tests/data/test222 b/tests/data/test222
index b850f5d5374ad0d02fa117732c8f0b3095d4472e..4c136dad04ffa6254617a8b1da69d47aa4acb076 100644
--- a/tests/data/test222
+++ b/tests/data/test222
@@ -183,7 +183,6 @@ http://%HOSTIP:%HTTPPORT/222 --compressed
 <protocol>
 GET /222 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Accept-Encoding: deflate, gzip
 
diff --git a/tests/data/test223 b/tests/data/test223
index 0b1e0110ff31bfb434b762a582a0060222778732..32bea35ca6cfa464af4d2da2797baa310b328cd0 100644
--- a/tests/data/test223
+++ b/tests/data/test223
@@ -72,7 +72,6 @@ http://%HOSTIP:%HTTPPORT/223 --compressed
 <protocol>
 GET /223 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Accept-Encoding: deflate, gzip
 
diff --git a/tests/data/test224 b/tests/data/test224
index e830d0b07c1d36c8a06a887945824498ddcdb6fe..bdd3f846a2d6689d92921522c0f373c941fedbe7 100644
--- a/tests/data/test224
+++ b/tests/data/test224
@@ -88,7 +88,6 @@ http://%HOSTIP:%HTTPPORT/224 --compressed
 <protocol>
 GET /224 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Accept-Encoding: deflate, gzip
 
diff --git a/tests/data/test233 b/tests/data/test233
index 0e329f7b6d4984cf558fa2c08842ff86714815f9..a428408b78ce90b478cb8e849a018dfc84a9402b 100644
--- a/tests/data/test233
+++ b/tests/data/test233
@@ -70,12 +70,14 @@ Authorization: Basic aWFtOm15c2VsZg==
 Host: first.host.it.is
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://goto.second.host.now/2330002 HTTP/1.1
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz
 Host: goto.second.host.now
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test234 b/tests/data/test234
index 02054d041ce33b4c09900968df8bce5aabb8bdb6..9c7d8c14ec962bc14091a3d3822065eaabd33c5b 100644
--- a/tests/data/test234
+++ b/tests/data/test234
@@ -70,6 +70,7 @@ Authorization: Basic aWFtOm15c2VsZg==
 Host: first.host.it.is
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://goto.second.host.now/2340002 HTTP/1.1
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz
@@ -77,6 +78,7 @@ Authorization: Basic aWFtOm15c2VsZg==
 Host: goto.second.host.now
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test239 b/tests/data/test239
index 6df716f92a42b12287a70650ac4be19c7d479199..591da70b8c20ac36612edd39452e8d19b672eaff 100644
--- a/tests/data/test239
+++ b/tests/data/test239
@@ -63,6 +63,7 @@ User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7
 Host: %HOSTIP:%HTTPPORT
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
@@ -72,6 +73,7 @@ User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7
 Host: 127.0.0.1:8990
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 6
 Content-Type: application/x-www-form-urlencoded
 
diff --git a/tests/data/test24 b/tests/data/test24
index d6590578cd58873f30483c8bc54412f19c485bde..be12be5d0a33366b3efc12f96abe99ddef099b04 100644
--- a/tests/data/test24
+++ b/tests/data/test24
@@ -36,7 +36,6 @@ http://%HOSTIP:%HTTPPORT/24 --fail
 GET /24 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test240 b/tests/data/test240
index e7617eec759285679eb1a1f163df45f77211ed24..c66aa6423ed4d4ffab175db96d6fc4c9c8803f38 100644
--- a/tests/data/test240
+++ b/tests/data/test240
@@ -43,7 +43,6 @@ HTTP-IPv6 GET
 <protocol>
 GET /240 HTTP/1.1
 Host: %HOST6IP:%HTTP6PORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test241 b/tests/data/test241
index 4f3d64b66fe00884429962afaf72c70a848e2ffe..e1a1ebba25fdb34d086694a0084bbd66a88465c8 100644
--- a/tests/data/test241
+++ b/tests/data/test241
@@ -37,7 +37,6 @@ HTTP-IPv6 GET (using ip6-localhost)
 <protocol>
 GET /241 HTTP/1.1
 Host: ip6-localhost:%HTTP6PORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test242 b/tests/data/test242
index 205f4de4aec68381b97fc80992f69e36b589f153..cc4c66e774cc709f766b5859183d9c0fcc7cc7c3 100644
--- a/tests/data/test242
+++ b/tests/data/test242
@@ -38,7 +38,6 @@ HTTP-IPv6 GET with username+password in URL
 GET /242 HTTP/1.1
 Authorization: Basic Zm9vYmFyOmJhcmZvbw==
 Host: %HOST6IP:%HTTP6PORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test243 b/tests/data/test243
index fd3f6a939cab850d4ac979c29935bff628a7d0b6..ebfdbb61d34a11c86ec46fdd9de9ffb1dfa7a314 100644
--- a/tests/data/test243
+++ b/tests/data/test243
@@ -82,6 +82,7 @@ User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7
 Host: 127.0.0.1:8990
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 6
 Content-Type: application/x-www-form-urlencoded
 
@@ -91,6 +92,7 @@ User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7
 Host: %HOSTIP:%HTTPPORT
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
@@ -100,6 +102,7 @@ User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7
 Host: 127.0.0.1:8990
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 6
 Content-Type: application/x-www-form-urlencoded
 
diff --git a/tests/data/test245 b/tests/data/test245
index 425c006dd49d3dcb73a3d55efc17fc032211b9ef..c4de97b8349d7d1f7169070167a04e5d8e3a670b 100644
--- a/tests/data/test245
+++ b/tests/data/test245
@@ -57,7 +57,6 @@ http://%HOSTIP:%HTTPPORT/245 -u auser:apasswd --digest -d "junkelijunk"
 POST /245 HTTP/1.1
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
@@ -66,7 +65,6 @@ POST /245 HTTP/1.1
 Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/245", response="379a439b1737ba257c1d2f103914b18b"
 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
 Host: 127.0.0.1:8990
-Pragma: no-cache
 Accept: */*
 Content-Length: 11
 Content-Type: application/x-www-form-urlencoded
diff --git a/tests/data/test246 b/tests/data/test246
index cfd12b0e715e59585f60a05cb1c0bb7dd7a19b5b..540f1d79448fc0761dfd1685c0a9bf0916875a15 100644
--- a/tests/data/test246
+++ b/tests/data/test246
@@ -67,7 +67,6 @@ http://%HOSTIP:%HTTPPORT/246 -u auser:apasswd --digest -d "junkelijunk"
 POST /246 HTTP/1.1
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
@@ -76,7 +75,6 @@ POST /246 HTTP/1.1
 Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/246", response="761e6fc9a760c39d587092e8d840e740"
 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
 Host: 127.0.0.1:8990
-Pragma: no-cache
 Accept: */*
 Content-Length: 11
 Content-Type: application/x-www-form-urlencoded
diff --git a/tests/data/test249 b/tests/data/test249
index 73f3b7f604f8cc4f6a7fa660fb744a5db674abeb..f196e23ee2e74d7eefc585e8b2cffd6b379edc05 100644
--- a/tests/data/test249
+++ b/tests/data/test249
@@ -38,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/249 -z "dec 12 12:00:00 1999 GMT"
 <protocol>
 GET /249 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
 
diff --git a/tests/data/test25 b/tests/data/test25
index 5e0b706cccbf694de31ba6ace63233888aa85450..f745357e99f7c6f9a5facacc3a7426a4be027dfb 100644
--- a/tests/data/test25
+++ b/tests/data/test25
@@ -79,37 +79,31 @@ http://%HOSTIP:%HTTPPORT/want/25 -L --max-redirs 5
 GET /want/25 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /want/data/reply/25 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /want/data/reply/data/reply/25 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /want/data/reply/data/reply/data/reply/25 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /want/data/reply/data/reply/data/reply/data/reply/25 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /want/data/reply/data/reply/data/reply/data/reply/data/reply/25 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test256 b/tests/data/test256
index bafeb81edc45fb8365d5ef0f4b335b3ae53c5317..38a38ba08bdf5332183985b17f5abeb33a6f2f87 100644
--- a/tests/data/test256
+++ b/tests/data/test256
@@ -51,6 +51,7 @@ Range: bytes=78-
 Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 
diff --git a/tests/data/test257 b/tests/data/test257
index 88a872c091ca4288b1affb09cf347224115905f7..5c81409cfabcb34e5c3f09bd8902cf1ee47e4e26 100644
--- a/tests/data/test257
+++ b/tests/data/test257
@@ -90,6 +90,7 @@ User-Agent: curl/7.14.0-CVS (i686-pc-linux-gnu) libcurl/7.14.0-CVS OpenSSL/0.9.7
 Host: supersite.com
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://anotherone.com/2570002 HTTP/1.1
 Authorization: Basic dXNlcjI6cGFzc3dkMg==
@@ -97,12 +98,14 @@ User-Agent: curl/7.14.0-CVS (i686-pc-linux-gnu) libcurl/7.14.0-CVS OpenSSL/0.9.7
 Host: anotherone.com
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://athird.com/2570003 HTTP/1.1
 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
 Host: athird.com
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test258 b/tests/data/test258
index 7b115eaa1ddb47090137f473d74e2c538932ea8d..947f0e0cdad8ddc123955cf0dbbf05c4cc3e79d2 100644
--- a/tests/data/test258
+++ b/tests/data/test258
@@ -77,6 +77,7 @@ User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 z
 Host: remotehost:54321
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 409
 Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce
 
@@ -103,6 +104,7 @@ Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911"
 Host: remotehost:54321
 Pragma: no-cache
 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 d7deb00948fe5e907ba940274cbb98f49e7a8d4a..84017407dd148038aa1d7df9fc6eb99e7fc12dff 100644
--- a/tests/data/test259
+++ b/tests/data/test259
@@ -74,6 +74,7 @@ User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 z
 Host: remotehost:54321
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 409
 Expect: 100-continue
 Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce
@@ -101,6 +102,7 @@ Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911"
 Host: remotehost:54321
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 Content-Length: 409
 Expect: 100-continue
 Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce
diff --git a/tests/data/test26 b/tests/data/test26
index 41f80e42a0720db50342449c05881dd050c42c3c..01b1bd7f3bf0b088627fdb7e0d0302bdb5505490 100644
--- a/tests/data/test26
+++ b/tests/data/test26
@@ -37,7 +37,6 @@ http://%HOSTIP:%HTTPPORT/want/26 -o - -o -
 GET /want/26 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test27 b/tests/data/test27
index df8599771bb870db99ed439a4ead6b6041b414d3..60a474aef83fd6aa4054bc9f223cfb2dad13de20 100644
--- a/tests/data/test27
+++ b/tests/data/test27
@@ -37,18 +37,15 @@ Get same cookie page several times
 <protocol>
 GET /want/27 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /want/27 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Cookie: thewinneris=nowayyouwin
 
 GET /want/27 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Cookie: thewinneris=nowayyouwin
 
diff --git a/tests/data/test28 b/tests/data/test28
index a746f23488ddbfbec29956c3bc93eb86d2582003..355924fa61ba4787b32c646aa43e185c401200e1 100644
--- a/tests/data/test28
+++ b/tests/data/test28
@@ -61,12 +61,10 @@ http://%HOSTIP:%HTTPPORT/want/28 -L
 <protocol>
 GET /want/28 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /online/1,1795,Welcome,00.html/280002.txt?logout=TRUE HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test29 b/tests/data/test29
index c258f6af6921ecaf97f9da3e2a02b1eb506307b3..5d18c39ae8d464e7bdd8afcf68a8185e2f45d75b 100644
--- a/tests/data/test29
+++ b/tests/data/test29
@@ -41,7 +41,6 @@ http://%HOSTIP:%HTTPPORT/want/29 -m 2
 <protocol>
 GET /want/29 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test3 b/tests/data/test3
index 9e13b0d6c3a81afec5e300d23e444d6b1a638316..2dc78967e1b76057d1472960e872d73b437c599f 100644
--- a/tests/data/test3
+++ b/tests/data/test3
@@ -49,7 +49,6 @@ HTTP POST with auth and contents but with content-length set to 0
 POST /3 HTTP/1.1
 Authorization: Basic ZmFrZTotdXNlcg==
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 37
 Content-Type: application/x-www-form-urlencoded
diff --git a/tests/data/test30 b/tests/data/test30
index 01b86f6cadc90728627d613aa6caffb6630b343e..efb18364030117ef6bec5c6aa710cf658c308740 100644
--- a/tests/data/test30
+++ b/tests/data/test30
@@ -32,7 +32,6 @@ http://%HOSTIP:%HTTPPORT/want/30
 <protocol>
 GET /want/30 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test300 b/tests/data/test300
index b96caa026706d326e242b27ce0e4108957b796f2..1c2d3b12d3914c5a3d485b1f831ffb19a39886d3 100644
--- a/tests/data/test300
+++ b/tests/data/test300
@@ -37,7 +37,6 @@ simple HTTPS GET
 <protocol>
 GET /300 HTTP/1.1
 Host: 127.0.0.1:%HTTPSPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test301 b/tests/data/test301
index 558979002ce50e6c5ac5e578a72fa281d035c1c3..a93559b780c05c417e7e98d10ce925e77f090f60 100644
--- a/tests/data/test301
+++ b/tests/data/test301
@@ -38,7 +38,6 @@ HTTPS GET with user and password
 GET /301 HTTP/1.1
 Authorization: Basic ZmFrZTp1c2Vy
 Host: 127.0.0.1:%HTTPSPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test303 b/tests/data/test303
index 9f5b1ece84ddf2eed0ce19d001d9d10eb072150d..bf221f889630acbc73ec940824c56ca481022d9c 100644
--- a/tests/data/test303
+++ b/tests/data/test303
@@ -36,7 +36,6 @@ http://%HOSTIP:%HTTPPORT/want/303 -m 2
 <protocol>
 GET /want/303 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test304 b/tests/data/test304
index f3363242e300909a48d4d770e9d25dd6f04d06cf..459034c2c617f51cc23400e44fe95535355e3b74 100644
--- a/tests/data/test304
+++ b/tests/data/test304
@@ -39,7 +39,6 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 POST /we/want/304 HTTP/1.1
 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:%HTTPSPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 1386
 Expect: 100-continue
diff --git a/tests/data/test306 b/tests/data/test306
index 438337b64e88f0754eafa2f8a7a47ce0be6e7f97..c0f3f09e1eac85f76a459171690ccdb57840cfa4 100644
--- a/tests/data/test306
+++ b/tests/data/test306
@@ -50,7 +50,6 @@ HTTPS GET, receive no headers only data!
 <protocol>
 GET /306 HTTP/1.1
 Host: 127.0.0.1:%HTTPSPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test31 b/tests/data/test31
index 879cd62a8254186bdffccbe511adff8be9f3a7e4..be312a59a6dcce934dab33ea1bb6860b9c79a649 100644
--- a/tests/data/test31
+++ b/tests/data/test31
@@ -51,7 +51,6 @@ http://%HOSTIP:%HTTPPORT/we/want/31 -b none -c log/jar31.txt
 <protocol>
 GET /we/want/31 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test32 b/tests/data/test32
index b381aa8a5a301d105fa676feb00e9cf44d0ac966..da0517f0bd0fbb623c30502ddcacfc772a58b495 100644
--- a/tests/data/test32
+++ b/tests/data/test32
@@ -48,7 +48,6 @@ HTTP with -d and -G
 GET /32?foo=moo&moo=poo HTTP/1.1
 User-Agent: curl/7.9.5 (i686-pc-linux-gnu) libcurl 7.9.5-cvs (OpenSSL 0.9.5) (ipv6 enabled)
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test33 b/tests/data/test33
index 77b36c419b25e2ce7a042e2283ace4afeb9e093a..780c94e04630bcadbe37b66fdf29eb8a1e24975b 100644
--- a/tests/data/test33
+++ b/tests/data/test33
@@ -49,7 +49,6 @@ PUT /33 HTTP/1.1
 Content-Range: bytes 50-99/100
 User-Agent: curl/7.6 (sparc-sun-solaris2.7) libcurl 7.6-pre4 (SSL 0.9.6) (krb4 enabled)
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 50
 Expect: 100-continue
diff --git a/tests/data/test34 b/tests/data/test34
index 9cfa288a09634b3b4124add35d09967c87419e34..a05ba75164a8fc7d72fb7be96930a2a37f2fb9db 100644
--- a/tests/data/test34
+++ b/tests/data/test34
@@ -57,7 +57,6 @@ http://%HOSTIP:%HTTPPORT/34
 <protocol>
 GET /34 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test36 b/tests/data/test36
index f4997b0462f1ba02569fa304593f8030fbe0e7b7..a71348e73fa60e4f5a2845b0500bbc767d3475e5 100644
--- a/tests/data/test36
+++ b/tests/data/test36
@@ -57,7 +57,6 @@ http://%HOSTIP:%HTTPPORT/36
 <protocol>
 GET /36 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test37 b/tests/data/test37
index 5a2e6b14cd758f00fc22e265d9b512c455b8adf0..3d39295b59695d6357826a49350de34cfbc00019 100644
--- a/tests/data/test37
+++ b/tests/data/test37
@@ -38,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/37
 <protocol>
 GET /37 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test38 b/tests/data/test38
index a2fdfc89fe6ef64dbfac61231af0956d1d806508..bf8cce8bdb8d18f78782deb124876a0c838d64d1 100644
--- a/tests/data/test38
+++ b/tests/data/test38
@@ -47,7 +47,6 @@ download on.
 GET /want/38 HTTP/1.1
 Range: bytes=78-
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test39 b/tests/data/test39
index 8f86491cd75eae9357fe7741c5b98d2446ab9cbf..862a24385352981c657222aa153280a443ebf8bc 100644
--- a/tests/data/test39
+++ b/tests/data/test39
@@ -45,7 +45,6 @@ foo
 POST /we/want/39 HTTP/1.1
 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 810
 Expect: 100-continue
diff --git a/tests/data/test4 b/tests/data/test4
index 2577343892d161b8cf044c0701daaaa41c360a88..342afadcd67981301c6580699ee3aa77d0167668 100644
--- a/tests/data/test4
+++ b/tests/data/test4
@@ -42,7 +42,6 @@ Replaced internal and added custom HTTP headers
 <protocol>
 GET /4 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 extra-header: here
 Accept: replaced
 
diff --git a/tests/data/test40 b/tests/data/test40
index ba0972b3f4ead0df944c5ba66b693fa3e5fed04c..c3bbe795623f126a540d3bf2747f05a80ff6cba9 100644
--- a/tests/data/test40
+++ b/tests/data/test40
@@ -61,13 +61,11 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/40 -L
 <protocol>
 GET /we/are/all/twits/40 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /we/are/all/moo.html/?name=d+a+niel&testcase=/400002 HTTP/1.1
 User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test42 b/tests/data/test42
index 4bd1b6fdec1c67056590d51fb55be804145e9fbf..df0edd5dd5b830a71acd9155737743e73ed94665 100644
--- a/tests/data/test42
+++ b/tests/data/test42
@@ -61,13 +61,11 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/42 -L
 <protocol>
 GET /we/are/all/twits/42 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /we/are/all/m%20o%20o.html/420002 HTTP/1.1
 User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test43 b/tests/data/test43
index 44ce45cdd15459cf402647a89c51b7fbf45d5d75..1ee0e2f89bb506714b7e22d12bdd7546bf19e429 100644
--- a/tests/data/test43
+++ b/tests/data/test43
@@ -65,11 +65,13 @@ GET http://127.0.0.1:%HTTPPORT/want/43 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://127.0.0.1:%HTTPPORT/want/data/430002.txt?coolsite=yes HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test44 b/tests/data/test44
index 70f8ac903b400f44be479c3e3bc5f0033bd9a489..ab66d11c00a221bd5421ca35d7b4d7a272364460 100644
--- a/tests/data/test44
+++ b/tests/data/test44
@@ -45,7 +45,6 @@ bar
 POST /we/want/44 HTTP/1.1
 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 408
 Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce
diff --git a/tests/data/test45 b/tests/data/test45
index 962ced5fa09b1338ea5ce012768481bc44cb0c71..b8d76201d0921298242ee2bf7b35c78a88adf21e 100644
--- a/tests/data/test45
+++ b/tests/data/test45
@@ -62,12 +62,10 @@ simple HTTP Location: without protocol in initial URL
 <protocol>
 GET /want/45 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /want/data.cgi?moo=http://&/450002 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test46 b/tests/data/test46
index df3f621e64425304957d58d63e471c3a769eda5a..da15c1b482abdf0ceb1769f9df4ea396f5fb31c9 100644
--- a/tests/data/test46
+++ b/tests/data/test46
@@ -56,7 +56,6 @@ www.loser.com	FALSE	/	FALSE	1139150993	UID	99
 <protocol>
 GET /want/46 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Cookie: empty=; mooo=indeed
 
diff --git a/tests/data/test47 b/tests/data/test47
index aba0bce2143da7a6d43098baa09a9f93419e9be0..835fcec190d3868b65bdb15b49eb2bc2bd6d496b 100644
--- a/tests/data/test47
+++ b/tests/data/test47
@@ -40,7 +40,6 @@ http://%HOSTIP:%HTTPPORT/47 -0
 <protocol>
 GET /47 HTTP/1.0
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test48 b/tests/data/test48
index de5f86bc2807ee2d15f71f8b6493ce51337b874c..036f739e91f5da978e2b493a28bac3da0bc1be36 100644
--- a/tests/data/test48
+++ b/tests/data/test48
@@ -39,7 +39,6 @@ HTTP with -d and -G and -I
 <protocol>
 HEAD /48?foo=moo&moo=poo HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test49 b/tests/data/test49
index 0c085f3a3100151a1a1d80097cfd7bed33ecad42..8822434eff9c7278862bbbeb824a4fd8d4a14176 100644
--- a/tests/data/test49
+++ b/tests/data/test49
@@ -61,13 +61,11 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/49 -L
 <protocol>
 GET /we/are/all/twits/49 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /we/are/all/moo.html/490002 HTTP/1.1
 User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test5 b/tests/data/test5
index ad51eac523e987f23a7433b8bfde4cd9e0866e09..db8aec2d0640b8b61355488e49cebc899caeac3f 100644
--- a/tests/data/test5
+++ b/tests/data/test5
@@ -43,6 +43,7 @@ GET http://127.0.0.1:%HTTPPORT/we/want/that/page/5 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test50 b/tests/data/test50
index f9baf7d8fd2104e2a21b0a694ce446f458b13f18..e508cc0865ec1dc3c64f4560c1727dfd97ad8caa 100644
--- a/tests/data/test50
+++ b/tests/data/test50
@@ -61,13 +61,11 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/50 -L
 <protocol>
 GET /we/are/all/twits/50 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /we/are/moo.html/500002 HTTP/1.1
 User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test500 b/tests/data/test500
index eb509c064b100cbdab3642cfef886ca9a73b37ea..95e2b260d59c71f8edb7d49156241f2b7e4cfb3c 100644
--- a/tests/data/test500
+++ b/tests/data/test500
@@ -41,7 +41,6 @@ http://%HOSTIP:%HTTPPORT/500
 <protocol>
 GET /500 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test503 b/tests/data/test503
index 834cfb1478f57c78d8426fd34594fc1a0f692a2e..5fd45be41ccd9d32d164fe8c1159a514a6a9139f 100644
--- a/tests/data/test503
+++ b/tests/data/test503
@@ -49,12 +49,13 @@ moo
 <verify>
 <protocol>
 CONNECT 127.0.0.1:%HTTPSPORT HTTP/1.0
+Host: 127.0.0.1:%HTTPSPORT
 Proxy-Authorization: Basic dGVzdDppbmc=
+Proxy-Connection: Keep-Alive
 
 GET /503 HTTP/1.1
 Authorization: Basic dGVzdDppbmc=
 Host: 127.0.0.1:%HTTPSPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test508 b/tests/data/test508
index 51e3f81547e99191bbfe433993d713d8b21050f4..7940b1260d5e362a7a878af2894dc9d549e2729b 100644
--- a/tests/data/test508
+++ b/tests/data/test508
@@ -36,7 +36,6 @@ http://%HOSTIP:%HTTPPORT/508
 <protocol>
 POST /508 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 45
 Content-Type: application/x-www-form-urlencoded
diff --git a/tests/data/test509 b/tests/data/test509
index 687e9e94ec9887164f008da7ebf19ec281484685..0bf6d3da039f537e4d3b84036a5344d0d733e171 100644
--- a/tests/data/test509
+++ b/tests/data/test509
@@ -44,7 +44,6 @@ https://127.0.0.1:%HTTPSPORT/dvcs %HTTPSPORT
 <protocol>
 GET /509 HTTP/1.1
 Host: 127.0.0.1:%HTTPSPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test51 b/tests/data/test51
index 706c55c38d0470c2d993058535f5ca4abf3e1a89..73774f488f18a522f32277d3690e87fa91989422 100644
--- a/tests/data/test51
+++ b/tests/data/test51
@@ -61,13 +61,11 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/51 -L
 <protocol>
 GET /we/are/all/twits/51 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /510002 HTTP/1.1
 User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test510 b/tests/data/test510
index 6ab346678088d81d1f0d646c6edc80e8cf2f4ff2..22b0aad2ddfe9a5f5572c86c9f7d87bc037dc127 100644
--- a/tests/data/test510
+++ b/tests/data/test510
@@ -36,7 +36,6 @@ http://%HOSTIP:%HTTPPORT/510
 <protocol>
 POST /510 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Transfer-Encoding: chunked
 Content-Type: application/x-www-form-urlencoded
diff --git a/tests/data/test512 b/tests/data/test512
index bd7f6fa6f8fc8e30a2775a11231e29b77a669fae..c6e3dbad4c5c22d39537c55b56cdfc4a088f7ecc 100644
--- a/tests/data/test512
+++ b/tests/data/test512
@@ -38,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/512
 <protocol>
 GET /512 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test513 b/tests/data/test513
index 8b1fcf61f84855213c4204f36fe49a14beb4d2e2..920cbcc17738dceeecd667982423fa40c3f15d1b 100644
--- a/tests/data/test513
+++ b/tests/data/test513
@@ -27,7 +27,6 @@ http://%HOSTIP:%HTTPPORT/513
 <protocol>
 POST /513 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 1
 Content-Type: application/x-www-form-urlencoded
diff --git a/tests/data/test514 b/tests/data/test514
index 1b6e5e686bfde877b3f824749412136184e48cd5..eed0da56eb788800a50cb8a1931345a541c72612 100644
--- a/tests/data/test514
+++ b/tests/data/test514
@@ -42,7 +42,6 @@ http://%HOSTIP:%HTTPPORT/514
 <protocol>
 HEAD /514 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test515 b/tests/data/test515
index 5feb4a94aed5f78ced79542077207f5fda8fa5f4..65d0f96aa8106041da25d8999af76e18c0604126 100644
--- a/tests/data/test515
+++ b/tests/data/test515
@@ -37,7 +37,6 @@ http://%HOSTIP:%HTTPPORT/515
 <protocol>
 POST /515 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
diff --git a/tests/data/test516 b/tests/data/test516
index 568e46bb59f3bcd6da1a3b98dee8335574587611..e1c890ac1463b44fa77ee8184f81035355faa13e 100644
--- a/tests/data/test516
+++ b/tests/data/test516
@@ -37,7 +37,6 @@ http://%HOSTIP:%HTTPPORT/516
 <protocol>
 POST /516 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 0
 
diff --git a/tests/data/test518 b/tests/data/test518
index 025739406d74b297bef2c069b1e423780f853e25..d050d073f88bf91251b779fa3041a29178cf1d56 100644
--- a/tests/data/test518
+++ b/tests/data/test518
@@ -49,7 +49,6 @@ http://%HOSTIP:%HTTPPORT/518
 <protocol>
 GET /518 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test519 b/tests/data/test519
index 7a5cec6c5600c4240c3e8d016807e6ebed33dd8f..d9adfdde29d316e411b6caaf42a2f2cba3a9497b 100644
--- a/tests/data/test519
+++ b/tests/data/test519
@@ -58,13 +58,11 @@ http://%HOSTIP:%HTTPPORT/519
 GET /519 HTTP/1.1
 Authorization: Basic bW9uc3Rlcjp1bmRlcmJlZA==
 Host: %HOSTIP:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /519 HTTP/1.1
 Authorization: Basic YW5vdGhlcm1vbnN0ZXI6aW53YXJkcm9iZQ==
 Host: %HOSTIP:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test52 b/tests/data/test52
index fc9388e93bccd0c3ac990187c4fd12114b1319af..ae78473cd10b01fc53190eee8168f90f2919bd8c 100644
--- a/tests/data/test52
+++ b/tests/data/test52
@@ -61,13 +61,11 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/52 -L
 <protocol>
 GET /we/are/all/twits/52 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /we/are/all/twits/520002 HTTP/1.1
 User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test522 b/tests/data/test522
index ceff5ecb8b278a55969aa23bb837698f4fbc112a..6578e33c4409983e702598ad40359a0ab07569a1 100644
--- a/tests/data/test522
+++ b/tests/data/test522
@@ -49,7 +49,6 @@ http://%HOSTIP/522 %HTTPPORT
 GET /522 HTTP/1.1
 Authorization: Basic eHh4Onl5eQ==
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test523 b/tests/data/test523
index 07c3b16a3d3f2a9f62b28b4170b0b17959ca8dce..ab125468cb71d3455d80f797f700b2bb389a9686 100644
--- a/tests/data/test523
+++ b/tests/data/test523
@@ -53,6 +53,7 @@ Authorization: Basic eHh4Onl5eQ==
 Host: www.haxx.se:19999
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 <stdout>
diff --git a/tests/data/test53 b/tests/data/test53
index 24c69039c6b1e429484d0b4cdfff76605d631e14..c653c355b87c8648b2bcd06c15a91321e11a76aa 100644
--- a/tests/data/test53
+++ b/tests/data/test53
@@ -45,7 +45,6 @@ HTTP, junk session cookies
 <protocol>
 GET /want/53 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Cookie: mooo=indeed
 
diff --git a/tests/data/test54 b/tests/data/test54
index 9fd6da7359bb8773ce7f5f94e956af437213d73a..0d5747eb6518b206b6ad5bbb078d3d7cd8b5c46e 100644
--- a/tests/data/test54
+++ b/tests/data/test54
@@ -37,7 +37,6 @@ http://%HOSTIP:%HTTPPORT/want/54 -L
 <protocol>
 GET /want/54 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test55 b/tests/data/test55
index 64794f2346835c7c6b470b6b6691ab99609287f2..c4a6e4c9b0ce83b6006ccc19f3ad474d89612ef1 100644
--- a/tests/data/test55
+++ b/tests/data/test55
@@ -53,13 +53,11 @@ http://%HOSTIP:%HTTPPORT/55 -L
 <protocol>
 GET /55 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /550002 HTTP/1.1
 User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test56 b/tests/data/test56
index d286542f7dd3d4ab5f3fc08e31306540383a4832..d4f369907b34406a788e1d90c36b761205435d0d 100644
--- a/tests/data/test56
+++ b/tests/data/test56
@@ -48,7 +48,6 @@ header "Transfer-Encoding: chunked"
 <protocol>
 POST /that.site.com/56 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Transfer-Encoding: chunked
 Content-Type: application/x-www-form-urlencoded
diff --git a/tests/data/test57 b/tests/data/test57
index 7326b0580d7c30817c029b24904d7c6a528593f8..f657ef0f7758f037f35e0fd8da9b890f1a826c43 100644
--- a/tests/data/test57
+++ b/tests/data/test57
@@ -39,7 +39,6 @@ text/html; charset=ISO-8859-4
 <protocol>
 GET /57 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test58 b/tests/data/test58
index 574aaf3538883c78fb5881c68285a519ee822aa8..32d773192c5b691ffe978527373e4b6c912de5f0 100644
--- a/tests/data/test58
+++ b/tests/data/test58
@@ -40,7 +40,6 @@ a few bytes
 <protocol>
 PUT /we/want/58te%5B%5Dst%2Etxt HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 12
 Expect: 100-continue
diff --git a/tests/data/test59 b/tests/data/test59
index 63e00e68128ae1762fda62a99b7cf64b9dff144c..5e0e694fae19de7006288408ec5d57b951620e06 100644
--- a/tests/data/test59
+++ b/tests/data/test59
@@ -39,7 +39,6 @@ HTTP URL with slash but with "parameter"
 <protocol>
 GET /?mooo/59 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test6 b/tests/data/test6
index 46844bc582bd0df505c07223175dd8be039ceda1..f7f1a4f0dd44b323c4e409158232ce75f3c1ce47 100644
--- a/tests/data/test6
+++ b/tests/data/test6
@@ -39,7 +39,6 @@ http://%HOSTIP:%HTTPPORT/we/want/that/page/6 -b "name=contents;name2=content2"
 <protocol>
 GET /we/want/that/page/6 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Cookie: name=contents;name2=content2
 
diff --git a/tests/data/test60 b/tests/data/test60
index 848ccf7ad114c56ab449840be9fa8b13d2554d3a..c4d6c4fb426299a414f312ec933476ae8d02d932 100644
--- a/tests/data/test60
+++ b/tests/data/test60
@@ -40,7 +40,6 @@ more than one byte
 <protocol>
 PUT /bzz/60 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Transfer-Encoding: chunked
 Content-Length: 1
diff --git a/tests/data/test61 b/tests/data/test61
index e607ede6ca893d66081cf8e5266ee141aac0ee6c..215470fbfec2a72804ddd4c27ba22d9ee90ab5d3 100644
--- a/tests/data/test61
+++ b/tests/data/test61
@@ -46,7 +46,6 @@ http://%HOSTIP:%HTTPPORT/we/want/61 -c log/jar61.txt -H "Host: www.host.foo.com"
 </strip>
 <protocol>
 GET /we/want/61 HTTP/1.1
-Pragma: no-cache
 Accept: */*
 Host: www.host.foo.com
 
diff --git a/tests/data/test62 b/tests/data/test62
index 4ba942e9cdcf06ee6ffb0a788fb572f918b2fa85..6d01f88dbaadd9d878530b14f3506fcd23943004 100644
--- a/tests/data/test62
+++ b/tests/data/test62
@@ -47,7 +47,6 @@ http://%HOSTIP:%HTTPPORT/we/want/62 -b log/jar62.txt -H "Host: www.host.foo.com"
 </strip>
 <protocol>
 GET /we/want/62 HTTP/1.1
-Pragma: no-cache
 Accept: */*
 Cookie: test2=yes; test=yes
 Host: www.host.foo.com
diff --git a/tests/data/test63 b/tests/data/test63
index 01c6f85fee37b031942924f208f59657b786f0ed..bcd5a188a9cee15a6e7ac937b0a6777f8e0077f3 100644
--- a/tests/data/test63
+++ b/tests/data/test63
@@ -44,6 +44,7 @@ Proxy-Authorization: Basic ZmFrZTp1c2Vy
 Host: we.want.that.site.com
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test64 b/tests/data/test64
index 63b2db4548606ddec41a559e2694d6f3e8bad0c0..9521102c70fa3ad66f6373d4babb0f69f1ba5091 100644
--- a/tests/data/test64
+++ b/tests/data/test64
@@ -62,14 +62,12 @@ http://%HOSTIP:%HTTPPORT/64 -u testuser:testpass --digest
 <protocol>
 GET /64 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /64 HTTP/1.1
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/64", response="c55f7f30d83d774a3d2dcacf725abaca"
 User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test65 b/tests/data/test65
index 146125f8aa6c973c29add3679164a60165e84dbd..ab519f91665100123d6322eeac0b7c13ca3eaaa6 100644
--- a/tests/data/test65
+++ b/tests/data/test65
@@ -66,14 +66,12 @@ http://%HOSTIP:%HTTPPORT/65 -u testuser:test2pass --digest
 <protocol>
 GET /65 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /65 HTTP/1.1
 Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/65", response="66d68d3251f1839576ba7c766cf9205b"
 User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test66 b/tests/data/test66
index f908654e70aba831c1519f5b02b0aba83e6a6e37..a67cf6386375122e5172ec2d5b8bff76a3605b19 100644
--- a/tests/data/test66
+++ b/tests/data/test66
@@ -33,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/66
 <protocol>
 GET /66 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test67 b/tests/data/test67
index 9bdccb5947797a74f60737c291723ca25de655f7..69023fa5041b3bc97bd11bc478222066f32cab2e 100644
--- a/tests/data/test67
+++ b/tests/data/test67
@@ -74,14 +74,12 @@ GET /67 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /67 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAYABgAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAAB4AAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FBqYVyF4y6/y/7F6qmEQ7lXjXFF3tH1145
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test68 b/tests/data/test68
index 3f0265daccad301046db888b7c474ed66d24fa54..8a0adcf9f2344ac82121bfe1c5765058bc7f5873 100644
--- a/tests/data/test68
+++ b/tests/data/test68
@@ -76,14 +76,12 @@ GET /68 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /68 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAYABgAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAAB4AAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FBqYVyF4y6/y/7F6qmEQ7lXjXFF3tH1145
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test69 b/tests/data/test69
index de0e39c17ad61eb7984cdca05b14f6d14cf3a278..0cfafd94a73f6920400ef38fcb3dafd41858ee92 100644
--- a/tests/data/test69
+++ b/tests/data/test69
@@ -88,21 +88,18 @@ http://%HOSTIP:%HTTPPORT/69 -u testuser:testpass --anyauth
 GET /69 HTTP/1.1
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /69 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /69 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAYABgAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAAB4AAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FBqYVyF4y6/y/7F6qmEQ7lXjXFF3tH1145
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test7 b/tests/data/test7
index 236cbb9f1dccc0e235e0e9bafe1b0fc437761a2b..cf15ff484dcf7076c4aad21d8f338a1b20b926f1 100644
--- a/tests/data/test7
+++ b/tests/data/test7
@@ -41,7 +41,6 @@ http://%HOSTIP:%HTTPPORT/we/want/7 -b none -D log/heads7.txt
 <protocol>
 GET /we/want/7 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test70 b/tests/data/test70
index 74abcdfadbf0403971ca2ccd9d30ce3a34255d7b..0c904ef7ec807b571412530c3e288c76aa7afcc7 100644
--- a/tests/data/test70
+++ b/tests/data/test70
@@ -73,14 +73,12 @@ http://%HOSTIP:%HTTPPORT/70 -u testuser:testpass --anyauth
 GET /70 HTTP/1.1
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /70 HTTP/1.1
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/70", response="2c9a6f00af0d86497b177b90e90c688a"
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test71 b/tests/data/test71
index 40d187c4ae7d9211511a060ddd64f21ab3bb0470..733db358c9e6bb97540ba343d41c2a69c2a5bf0a 100644
--- a/tests/data/test71
+++ b/tests/data/test71
@@ -49,7 +49,6 @@ bar
 POST /we/want/71 HTTP/1.1
 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 408
 Expect: 100-continue
diff --git a/tests/data/test72 b/tests/data/test72
index 46352c2ad55479a8a1a853bc2d6fc53c0dc2b0de..465c61199fb361460210d51f0174ead566e34570 100644
--- a/tests/data/test72
+++ b/tests/data/test72
@@ -69,14 +69,12 @@ http://%HOSTIP:%HTTPPORT/72 -u testuser:testpass --anyauth
 GET /72 HTTP/1.1
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /72 HTTP/1.1
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/72", response="9fcd1330377365a09bbcb33b2cbb25bd"
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test73 b/tests/data/test73
index bb2853da7eac7bbd33bdb649ebeaf8709d257899..a7484cd467ae3418082ce3a6daac6f7efd3c08a6 100644
--- a/tests/data/test73
+++ b/tests/data/test73
@@ -37,7 +37,6 @@ http://%HOSTIP:%HTTPPORT/we/want/73 -c log/jar73.txt -H "Host: host.NOT_DISCLOSE
 </strip>
 <protocol>
 GET /we/want/73 HTTP/1.1
-Pragma: no-cache
 Accept: */*
 Host: host.NOT_DISCLOSED.se
 
diff --git a/tests/data/test74 b/tests/data/test74
index bc9036756a813c6da17c7f2e840f1928c43b34c3..6a0793d7c3483ad028b13358f7189f92d28fbc08 100644
--- a/tests/data/test74
+++ b/tests/data/test74
@@ -54,12 +54,10 @@ HTTP, urlglob {}-retrieval and -o #[num] usage
 <protocol>
 GET /74 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /740001 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test77 b/tests/data/test77
index 2b8db1586e5161c6a047d5c9a5d4c7005dcf455e..369120cebb17c177fb3b0e92e8e4e90ae654ba49 100644
--- a/tests/data/test77
+++ b/tests/data/test77
@@ -46,7 +46,6 @@ http://%HOSTIP:%HTTPPORT/77 -z "dec 12 12:00:00 1999 GMT"
 <protocol>
 GET /77 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
 
diff --git a/tests/data/test78 b/tests/data/test78
index 4c7b06cc617a68f0ca5006023246740f1082fb3b..a3b2d5b6ebd214238966caa290e98707c932f4d5 100644
--- a/tests/data/test78
+++ b/tests/data/test78
@@ -58,7 +58,6 @@ http://%HOSTIP:%HTTPPORT/78 -z "dec 12 11:00:00 1999 GMT"
 <protocol>
 GET /78 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT
 
diff --git a/tests/data/test79 b/tests/data/test79
index bacb0b8452ba82265d0e964cc0e0b8cfaa35bfc8..6d080bd5d77f234180066497fc4ad5db2c6b832b 100644
--- a/tests/data/test79
+++ b/tests/data/test79
@@ -45,6 +45,7 @@ GET ftp://127.0.0.1:%HTTPPORT/we/want/that/page/79 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test8 b/tests/data/test8
index 31c985fe4186bcde8faa8491211cb16ffad3c553..683899ae1d7dc25ddf58ae0dd84b9613209da9da 100644
--- a/tests/data/test8
+++ b/tests/data/test8
@@ -49,7 +49,6 @@ Set-Cookie: partmatch=present; domain=.0.0.1; path=/;
 <protocol>
 GET /we/want/8 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Cookie: partmatch=present; foobar=name
 
diff --git a/tests/data/test80 b/tests/data/test80
index 89587b27e384ca0052d5cfe578d07f63e3913a5a..dcf153dd73c62b64ddcf04364318ca7084e11452 100644
--- a/tests/data/test80
+++ b/tests/data/test80
@@ -39,7 +39,7 @@ contents
 http
 </server>
  <name>
-HTTP CONNECT with proxy and host Basic authentication
+HTTP CONNECT with proxytunnel and host Basic authentication
  </name>
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/that/page/80 -p -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user youare:yourself
@@ -54,14 +54,15 @@ http://%HOSTIP:%HTTPPORT/we/want/that/page/80 -p -x %HOSTIP:%HTTPPORT --user iam
 </strip>
 <protocol>
 CONNECT 127.0.0.1:%HTTPPORT HTTP/1.0
+Host: 127.0.0.1:%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
 
 GET /we/want/that/page/80 HTTP/1.1
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test81 b/tests/data/test81
index 3fc2634a091e42c5a941477a57dce0fc1fa1f385..056571bed474afde4c33b31c7b713c659ff7c19a 100644
--- a/tests/data/test81
+++ b/tests/data/test81
@@ -74,6 +74,7 @@ User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9
 Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 GET http://127.0.0.1:%HTTPPORT/81 HTTP/1.1
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAYABgAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAAB4AAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FBqYVyF4y6/y/7F6qmEQ7lXjXFF3tH1145
@@ -81,6 +82,7 @@ User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9
 Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test82 b/tests/data/test82
index 13e36006330c47ca154d0386b85490e73c23322e..3bfae9fc2ea3c5a1acd94bc9aa4ad8c23d09527e 100644
--- a/tests/data/test82
+++ b/tests/data/test82
@@ -48,6 +48,7 @@ User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9
 Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test83 b/tests/data/test83
index 909f780639d4db3fc380df40063408adb8eee931..d68a042be9a2f924c5d970e810c644a307b1ada7 100644
--- a/tests/data/test83
+++ b/tests/data/test83
@@ -55,12 +55,13 @@ http://%HOSTIP:%HTTPPORT/we/want/that/page/83 -p -x %HOSTIP:%HTTPPORT --user iam
 <protocol>
 CONNECT 127.0.0.1:%HTTPPORT HTTP/1.0
 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: 127.0.0.1:%HTTPPORT
+Proxy-Connection: Keep-Alive
 
 GET /we/want/that/page/83 HTTP/1.1
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test84 b/tests/data/test84
index fb520eae1ed75e85cb1f7f5dfa70b015141142cd..387d0e08e6072e9cfe554e3a5e363ac6b3293710 100644
--- a/tests/data/test84
+++ b/tests/data/test84
@@ -47,6 +47,7 @@ User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9
 Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test85 b/tests/data/test85
index d19861bc00832d1ed3b53d487704c0df3ac48932..50629e0dae6006019c7f73aa0750223ff7fbc70c 100644
--- a/tests/data/test85
+++ b/tests/data/test85
@@ -48,6 +48,7 @@ User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9
 Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test86 b/tests/data/test86
index bc8f23ca24040304ec8d0b98bf49f71434c30080..e1403962d2accc0a38bc8d178415796b6a66040a 100644
--- a/tests/data/test86
+++ b/tests/data/test86
@@ -69,19 +69,16 @@ HTTP, urlglob []-retrieval and -o #[num] usage
 GET /860001 HTTP/1.1
 User-Agent: curl/7.10.7-pre4 (i686-pc-linux-gnu) libcurl/7.10.7-pre4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /860002 HTTP/1.1
 User-Agent: curl/7.10.7-pre4 (i686-pc-linux-gnu) libcurl/7.10.7-pre4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /860003 HTTP/1.1
 User-Agent: curl/7.10.7-pre4 (i686-pc-linux-gnu) libcurl/7.10.7-pre4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test88 b/tests/data/test88
index c09f6d6c93bee2a63df014fb40f6ecd4a5ad76ec..45791fcba8a19871feae60fc939d762958cb738f 100644
--- a/tests/data/test88
+++ b/tests/data/test88
@@ -76,7 +76,6 @@ four is the number of lines
 <protocol>
 PUT /88 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 0
 Expect: 100-continue
@@ -85,7 +84,6 @@ PUT /88 HTTP/1.1
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/88", response="78a49fa53d0c228778297687d4168e71"
 User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 85
 Expect: 100-continue
diff --git a/tests/data/test89 b/tests/data/test89
index 93d44dbb97ea3cd1c9fc1206445b964ef1ac60ea..89904d7488bfc318af8c2cc08373abc4e814de6e 100644
--- a/tests/data/test89
+++ b/tests/data/test89
@@ -107,28 +107,24 @@ GET /89 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /89 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAYABgAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAAB4AAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FBqYVyF4y6/y/7F6qmEQ7lXjXFF3tH1145
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /you/890010 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 User-Agent: curl/7.10.8-pre1 (i686-pc-linux-gnu) libcurl/7.10.8-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /you/890010 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAYABgAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAAB4AAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FBqYVyF4y6/y/7F6qmEQ7lXjXFF3tH1145
 User-Agent: curl/7.10.8-pre1 (i686-pc-linux-gnu) libcurl/7.10.8-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test9 b/tests/data/test9
index e3c1a7df42214b0149711fbbfe03434d7adab688..7476278ec6e5eadf101d47934170b83b849b8c42 100644
--- a/tests/data/test9
+++ b/tests/data/test9
@@ -45,7 +45,6 @@ bar
 POST /we/want/9 HTTP/1.1
 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 407
 Expect: 100-continue
diff --git a/tests/data/test90 b/tests/data/test90
index 96da409c90329f814428f09f5a65505711b0bed2..5a9dc3479ee765db9a8f0e446a368a2c07b77287 100644
--- a/tests/data/test90
+++ b/tests/data/test90
@@ -140,40 +140,34 @@ http://%HOSTIP:%HTTPPORT/90 -u testuser:testpass --anyauth -L
 <protocol>
 GET /90 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /90 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /90 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAYABgAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAAB4AAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FBqYVyF4y6/y/7F6qmEQ7lXjXFF3tH1145
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /you/900010 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /you/900010 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 User-Agent: curl/7.10.8-pre1 (i686-pc-linux-gnu) libcurl/7.10.8-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /you/900010 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAYABgAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAAB4AAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FBqYVyF4y6/y/7F6qmEQ7lXjXFF3tH1145
 User-Agent: curl/7.10.8-pre1 (i686-pc-linux-gnu) libcurl/7.10.8-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test91 b/tests/data/test91
index aa1db462812ad68045699c3b38eb91fa41335e3b..bad4f3a57498c276295a357ecaefe9212d9a88be 100644
--- a/tests/data/test91
+++ b/tests/data/test91
@@ -91,21 +91,18 @@ http://%HOSTIP:%HTTPPORT/91 --anyauth -u mydomain\\myself:secret
 GET /91 HTTP/1.1
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /91 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 GET /91 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAE4AAAAYABgAZgAAAAgACABAAAAABgAGAEgAAAAAAAAATgAAAAAAAAB+AAAAAYIAAG15ZG9tYWlubXlzZWxmwjImlHmYemDYVmFrmRFoVn3jfoYDE+7QLmWXF7FJDlDNWSItJ+RylXJGAJdepH4C
 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
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test92 b/tests/data/test92
index cf47c226049c5086adf5f7dd32f7263f2a423b7a..3c043aab08e0e73144dc9552b880980d0e6a5c29 100644
--- a/tests/data/test92
+++ b/tests/data/test92
@@ -43,7 +43,6 @@ http://%HOSTIP:%HTTPPORT/want/92 -C 87
 GET /want/92 HTTP/1.1
 Range: bytes=87-
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test93 b/tests/data/test93
index b269d99c0ed60189fc43e7a2c087733cc1160bff..b98d32bdcc692fc8ddc1ee943c34425df4dabf42 100644
--- a/tests/data/test93
+++ b/tests/data/test93
@@ -43,6 +43,7 @@ GET http://127.0.0.1:%HTTPPORT/93 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
+Proxy-Connection: Keep-Alive
 
 </protocol>
 </verify>
diff --git a/tests/data/test94 b/tests/data/test94
index e3680b56dae7c76c95e44e295860e657ff25a501..2deeb4f27d33ac8444d2d3e288a8fbaf7fcd11aa 100644
--- a/tests/data/test94
+++ b/tests/data/test94
@@ -48,6 +48,8 @@ https://test.anything.really.com:94 -x %HOSTIP:%HTTPPORT
 <protocol>
 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 c25e4d3a1e3cf9112cccc7ad0cfd704e23049234..5a5aebcd384e2e41512f96b51c4c3a359e9ecec3 100644
--- a/tests/data/test95
+++ b/tests/data/test95
@@ -53,11 +53,12 @@ http://%HOSTIP:%HTTPPORT/we/want/that/page/95 -p -x %HOSTIP:%HTTPPORT -d "datato
 <protocol nonewline=yes>
 CONNECT 127.0.0.1:%HTTPPORT HTTP/1.0
 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: 127.0.0.1:%HTTPPORT
+Proxy-Connection: Keep-Alive
 
 POST /we/want/that/page/95 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: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 27
 Content-Type: application/x-www-form-urlencoded
diff --git a/tests/data/test97 b/tests/data/test97
index 1c080547b7b12e4ab6a33c3dfc1a08bf7ac7fc4e..121ffa4dbb2d4b15ff6802ff84574a2e11a9c9fd 100644
--- a/tests/data/test97
+++ b/tests/data/test97
@@ -41,7 +41,6 @@ HTTP POST with custom content-type
 <protocol nonewline=yes>
 POST /97 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Type: silly/type
 Content-Length: 14
diff --git a/tests/data/test98 b/tests/data/test98
index 84d48b6fb8a3bdc7bcdc24200ac01008a4e830bb..5878c578fb79494b479398f9019fd4c51a7d087f 100644
--- a/tests/data/test98
+++ b/tests/data/test98
@@ -44,7 +44,6 @@ data on stdin
 <protocol>
 PUT /98 HTTP/1.1
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 Content-Length: 14
 Expect: 100-continue
diff --git a/tests/data/test99 b/tests/data/test99
index f3148426523cb61477a96f3b3b26319806b34619..49cfdc2860dd04e78861fc079eb10cef9129ca68 100644
--- a/tests/data/test99
+++ b/tests/data/test99
@@ -60,7 +60,6 @@ http://%HOSTIP:%HTTPPORT/99 -C 9999999999
 GET /99 HTTP/1.1
 Range: bytes=9999999999-
 Host: 127.0.0.1:%HTTPPORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>