From 03b73e899208f720d559a55b43297f76eeeba43f Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Tue, 10 May 2016 01:11:21 +1200 Subject: [PATCH] Bug 4501: HTTP/1.1: normalize Host header --- src/client_side.cc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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; -- 2.47.2