From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 9 May 2016 13:11:21 +0000 (+1200)
Subject: Bug 4501: HTTP/1.1: normalize Host header
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03b73e899208f720d559a55b43297f76eeeba43f;p=thirdparty%2Fsquid.git

Bug 4501: HTTP/1.1: normalize Host header
---

diff --git a/src/client_side.cc b/src/client_side.cc
index a6242f7e51..1ec92516c8 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -2740,6 +2740,23 @@ clientProcessRequest(ConnStateData *conn, HttpParser *hp, ClientSocketContext *c
         goto finish;
     }
 
+    // when absolute-URI is provided Host header should be ignored. However
+    // some code still uses Host directly so normalize it.
+    // For now preserve the case where Host is completely absent.
+    if (request->header.has(HDR_HOST)) {
+        const char *host = request->header.getStr(HDR_HOST);
+        MemBuf authority;
+        authority.init();
+        if (request->port != urlDefaultPort(request->protocol))
+            authority.Printf("%s:%d", request->GetHost(), request->port);
+        else
+            authority.Printf("%s", request->GetHost());
+        debugs(33, 5, "URL domain " << authority.buf << " overrides header Host: " << host);
+        // URL authority overrides Host header
+        request->header.delById(HDR_HOST);
+        request->header.putStr(HDR_HOST, authority.buf);
+    }
+
     request->clientConnectionManager = conn;
 
     request->flags.accelerated = http->flags.accel;