From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 26 Nov 2010 10:09:52 +0000 (+1300)
Subject: Send HTTP/1.1 on CONNECT responses
X-Git-Tag: take1~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c4fcf0f3c379bb5809677c2f86b92ca9c368992;p=thirdparty%2Fsquid.git

Send HTTP/1.1 on CONNECT responses

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

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index 59148f53aa..8d1c457d02 100644
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -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);
 }
diff --git a/src/tunnel.cc b/src/tunnel.cc
index b0489e0ea4..0221003ec5 100644
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -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;