Modified the default HTTP headers used by libcurl:

A) Normal non-proxy HTTP:

 - no more "Pragma: no-cache" (this only makes sense to proxies)

B) Non-CONNECT HTTP request over proxy:

 - "Pragma: no-cache" is used (like before)
 - "Proxy-Connection: Keep-alive" (for older style 1.0-proxies)

C) CONNECT HTTP request over proxy:

 - "Host: [name]:[port]"
 - "Proxy-Connection: Keep-alive"

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) {
+    if(http) {
-      /* The whole request could not be sent in one system call. We must queue
+      if((size_t)amount != size) {
-         it up and send it later when we get the chance. We must not loop here
+        /* The whole request could not be sent in one system call. We must
-         and wait until it might work again. */
+           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 */
+        /* backup the currently set pointers */
-      http->backup.fread = conn->fread;
+        http->backup.fread = conn->fread;
-      http->backup.fread_in = conn->fread_in;
+        http->backup.fread_in = conn->fread_in;
-      http->backup.postdata = http->postdata;
+        http->backup.postdata = http->postdata;
-      http->backup.postsize = http->postsize;
+        http->backup.postsize = http->postsize;
 
-      /* set the new pointers for the request-sending */
+        /* set the new pointers for the request-sending */
-      conn->fread = (curl_read_callback)readmoredata;
+        conn->fread = (curl_read_callback)readmoredata;
-      conn->fread_in = (void *)conn;
+        conn->fread_in = (void *)conn;
-      http->postdata = ptr;
+        http->postdata = ptr;
-      http->postsize = (curl_off_t)size;
+        http->postsize = (curl_off_t)size;
 
-      http->send_buffer = in;
+        http->send_buffer = in;
-      http->sending = HTTPSEND_REQUEST;
+        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
+ * ConnectHTTPProxyTunnel() requires that we're connected to a HTTP
- * function will issue the necessary commands to get a seamless tunnel through
+ * proxy. This function will issue the necessary commands to get a seamless
- * this proxy. After that, the socket can be used just as a normal socket.
+ * 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) {
 
-      /* OK, now send the connect request to the proxy */
+    if(CURLE_OK == result) {
-      result =
+      char *host=(char *)"";
-        Curl_sendf(tunnelsocket, conn,
+      const char *proxyconn="";
-                   "CONNECT %s:%d HTTP/1.0\015\012"
+      char *ptr;
-                   "%s"
+
-                   "%s"
+      ptr = checkheaders(data, "Host:");
-                   "\r\n",
+      if(!ptr) {
-                   hostname, remote_port,
+        host = aprintf("Host: %s\r\n", host_port);
-                   conn->allocptr.proxyuserpwd?
+        if(!host)
-                   conn->allocptr.proxyuserpwd:"",
+          result = CURLE_OUT_OF_MEMORY;
-                   data->set.useragent?conn->allocptr.uagent:""
+      }
-                   );
+      ptr = checkheaders(data, "Proxy-Connection:");
+      if(!ptr)
+        proxyconn = "Proxy-Connection: Keep-Alive\r\n";
+
+      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 =
-    http->p_pragma = "Pragma: no-cache\r\n";
+    (!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) {
+    result = add_custom_headers(conn, req_buffer);
-      ptr = strchr(headers->data, ':');
+    if(result)
-      if(ptr) {
+      return result;
-        /* 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;
-    }
 
     http->postdata = NULL;  /* nothing to post at this point */
     Curl_pgrsSetUploadSize(data, 0); /* upload size is 0 atm */

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>

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

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>

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>

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>

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>

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>

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>

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>

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>

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>

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

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

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

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>

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

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>

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>

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>

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>

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

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>

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>

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

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>

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>

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>

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>

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>

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">

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
 

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

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

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

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

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

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>

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>

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>

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
 

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

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>
 

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>
 

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>

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

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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
 

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>

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

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>

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

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

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
 

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
 

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
 

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
 

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
 

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>

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>

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
 

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>

tests/data/test240

@@ -43,7 +43,6 @@ HTTP-IPv6 GET
 <protocol>
 GET /240 HTTP/1.1
 Host: %HOST6IP:%HTTP6PORT
-Pragma: no-cache
 Accept: */*
 
 </protocol>

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>

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>

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
 

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

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

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
 

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>

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>
 

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>

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
 

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

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>

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
 

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>

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>

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

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>

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>

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>

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>

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

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>

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>

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>

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