Merged from trunk

diff --cc src/cache_cf.cc
Simple merge

diff --cc src/client_side.cc
index b4c427fef71d446967a009526f549ecb062a47d6,b285d38b6ace1d66f2f87ae7660c770a4f7e0b3a..587294468985e688b16217b0eaf75a525d04e7bf
--- 1/src/client_side.cc
--- 2/src/client_side.cc
+++ b/src/client_side.cc
@@@ -2317,9 -2316,9 +2317,9 @@@ parseHttpRequest(ConnStateData *csd, Ht
          http->uri = xstrdup(internalLocalUri(NULL, url));
          // We just re-wrote the URL. Must replace the Host: header.
          //  But have not parsed there yet!! flag for local-only handling.
-         http->flags.internal = 1;
+         http->flags.internal = true;
  
 -    } else if (csd->port->accel || csd->switchedToHttps()) {
 +    } else if (csd->port->flags.accelSurrogate || csd->switchedToHttps()) {
          /* accelerator mode */
          prepareAcceleratedURL(csd, http, url, req_hdr);
      }

diff --cc src/client_side_request.cc
Simple merge

diff --cc src/forward.cc
Simple merge