Author: Henrik Nordstrom <henrik@henriknordstrom.net>

Fix cache_peer forceddomainname when request has a Host header

cache_peer forceddomainname=xxx only worked when the received request
did not have a Host header.

diff --git a/src/http.cc b/src/http.cc
index af8d44d375fcebbae2999d02cceb0107d5c37b9a..f11e7715e855257dd5f28ed07be2fb5d7fd426e1 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -1563,8 +1563,9 @@ copyOneHeaderFromClientsideRequestToUpstreamRequest(const HttpHeaderEntry *e, St
          * went through our redirector and the admin configured
          * 'redir_rewrites_host' to be off.
          */
-
-        if (request->flags.redirected && !Config.onoff.redir_rewrites_host)
+       if (orig_request->peer_domain)
+            hdr_out->putStr(HDR_HOST, orig_request->peer_domain);
+        else if (request->flags.redirected && !Config.onoff.redir_rewrites_host)
             hdr_out->addEntry(e->clone());
         else {
             /* use port# only if not default */