From: Francesco Chemolli Date: Mon, 4 Feb 2013 08:59:59 +0000 (+0100) Subject: Merged from trunk X-Git-Tag: SQUID_3_4_0_1~312^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29c909e2c9bb085f90ef23582c22bdf9e3ee171e;p=thirdparty%2Fsquid.git Merged from trunk --- 29c909e2c9bb085f90ef23582c22bdf9e3ee171e diff --cc src/client_side.cc index b4c427fef7,b285d38b6a..5872944689 --- a/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); }