From c7b1432ce5e49d061a182df0b09db5de36d787f5 Mon Sep 17 00:00:00 2001
From: Marcello Coutinho <marcellocoutinho@gmail.com>
Date: Sun, 22 Apr 2012 04:11:38 +0000
Subject: squid3 - version 2.0.5 with transparent proxy fix and integration
 with captive portal for non transparent use.

---
 config/squid-reverse/squid.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'config/squid-reverse/squid.xml')

diff --git a/config/squid-reverse/squid.xml b/config/squid-reverse/squid.xml
index 981c256c..764011ea 100644
--- a/config/squid-reverse/squid.xml
+++ b/config/squid-reverse/squid.xml
@@ -236,11 +236,20 @@
 		<field>
 			<fielddescr>Transparent proxy</fielddescr>
 			<fieldname>transparent_proxy</fieldname>
-			<description>If transparent mode is enabled, all requests for destination port 80 will be forwarded to the proxy server without any additional configuration necessary.</description>
+			<description><![CDATA[Enable transparent mode to forward all requests for destination port 80 to the proxy server without any additional configuration necessary.<br>
+						 <strong>NOTE:</strong> Transparent mode does not filter ssl(port 443) or any other http/https port.<br>
+						 To filter both http and https protocol without touching user config, enable WPAD/PAC options on your dns/dhcp.]]></description>
 			<type>checkbox</type>
 			<enablefields>private_subnet_proxy_off,defined_ip_proxy_off,defined_ip_proxy_off_dest</enablefields>			
 			<required/>
 		</field>
+		<field>
+			<fielddescr>Patch captive portal</fielddescr>
+			<fieldname>patch_cp</fieldname>
+			<description><![CDATA[Enable this option to force captive portal to non transparent proxy users.<br>
+						<strong>NOTE:</strong> You may need to reapply captive portal config after changing this option.]]></description>
+			<type>checkbox</type>
+		</field>
 		<field>
 			<fielddescr>Bypass proxy for Private Address Space (RFC 1918) destination</fielddescr>
 			<fieldname>private_subnet_proxy_off</fieldname>
-- 
cgit v1.2.3