]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Send HTTP/1.1 on CONNECT responses
authorAmos Jeffries <squid3@treenet.co.nz>
Fri, 26 Nov 2010 10:09:52 +0000 (23:09 +1300)
committerAmos Jeffries <squid3@treenet.co.nz>
Fri, 26 Nov 2010 10:09:52 +0000 (23:09 +1300)
CONNECT seems to have been missed somehow in the 1.1 conversion.
This corrects the omission so the hard-coded CONNECT reply strings send
1.1 as well.

src/client_side_request.cc
src/tunnel.cc

index 59148f53aad30e4653cdf399c71d5ba7543848a9..8d1c457d026f4ce24283da63f44b64e850cdf3a5 100644 (file)
@@ -931,7 +931,7 @@ clientInterpretRequestHeaders(ClientHttpRequest * http)
     if (req_hdr->has(HDR_VIA)) {
         String s = req_hdr->getList(HDR_VIA);
         /*
-         * ThisCache cannot be a member of Via header, "1.0 ThisCache" can.
+         * ThisCache cannot be a member of Via header, "1.1 ThisCache" can.
          * Note ThisCache2 has a space prepended to the hostname so we don't
          * accidentally match super-domains.
          */
@@ -1204,7 +1204,7 @@ ClientHttpRequest::sslBumpStart()
 
     // TODO: Unify with tunnel.cc and add a Server(?) header
     static const char *const conn_established =
-        "HTTP/1.0 200 Connection established\r\n\r\n";
+        "HTTP/1.1 200 Connection established\r\n\r\n";
     comm_write(fd, conn_established, strlen(conn_established),
                &SslBumpEstablish, this, NULL);
 }
index b0489e0ea4201593735a5ae5534617f6dc913135..0221003ec5a5f0a5f63e16f334a99ad7aa63044d 100644 (file)
@@ -117,7 +117,7 @@ private:
 
 #define fd_closed(fd) (fd == -1 || fd_table[fd].closing())
 
-static const char *const conn_established = "HTTP/1.0 200 Connection established\r\n\r\n";
+static const char *const conn_established = "HTTP/1.1 200 Connection established\r\n\r\n";
 
 static CNCB tunnelConnectDone;
 static ERCB tunnelErrorComplete;