From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Sun, 6 Apr 2008 01:31:13 +0000 (+0200)
Subject: Fallback on transparent interception mode even if the connection didn't seem
X-Git-Tag: BASIC_TPROXY4~3^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bed4f1143d5d4dab14568288568a283d8f9d7679;p=thirdparty%2Fsquid.git

Fallback on transparent interception mode even if the connection didn't seem
to be transparently intercepted

Needed to deal properly with situations where connections to the local host
is intercepted, or when people NAT outside the Squid server but still compile
Squid with support for the NAT/interception method availabe on the host OS..
---

diff --git a/src/client_side.cc b/src/client_side.cc
index db8561a4b2..6caddbd82a 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1995,6 +1995,9 @@ parseHttpRequest(ConnStateData *conn, HttpParser *hp, HttpRequestMethod * method
         /* prepend our name & port */
         http->uri = xstrdup(internalLocalUri(NULL, url));
         http->flags.accel = 1;
+    } else if (conn->port->transparent) {
+	// Fallback on transparent if enabled, useful for "self" requests
+        prepareTransparentURL(conn, http, url, req_hdr);
     }
 
     if (!http->uri) {