diff options
Diffstat (limited to 'config/squid3')
| -rw-r--r-- | config/squid3/squid.inc | 11 | ||||
| -rw-r--r-- | config/squid3/squid.xml | 5 |
2 files changed, 3 insertions, 13 deletions
diff --git a/config/squid3/squid.inc b/config/squid3/squid.inc index 417eaeae..c1b5b419 100644 --- a/config/squid3/squid.inc +++ b/config/squid3/squid.inc @@ -344,17 +344,6 @@ function squid_validate_general($post, $input_errors) { $input_errors[] = "You can not run squid on the same port as the webgui"; } - if (($post['transparent_proxy'] != 'on') && ($post['private_subnet_proxy_off'] == 'on')) { - $input_errors[] = "You can not bypass traffic to private subnets without using the transparent proxy."; - } - - if (($post['transparent_proxy'] != 'on') && !empty($post['defined_ip_proxy_off'])) { - $input_errors[] = "You can not bypass traffic from specific IPs without using the transparent proxy."; - } - if (($post['transparent_proxy'] != 'on') && !empty($post['defined_ip_proxy_off_dest'])) { - $input_errors[] = "You can not bypass traffic to specific IPs without using the transparent proxy."; - } - foreach (array('defined_ip_proxy_off') as $hosts) { foreach (explode(";", $post[$hosts]) as $host) { $host = trim($host); diff --git a/config/squid3/squid.xml b/config/squid3/squid.xml index 414ac0ff..f82cf81a 100644 --- a/config/squid3/squid.xml +++ b/config/squid3/squid.xml @@ -166,6 +166,7 @@ <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> <type>checkbox</type> + <enablefields>private_subnet_proxy_off,defined_ip_proxy_off,defined_ip_proxy_off_dest</enablefields> <required/> </field> <field> @@ -177,14 +178,14 @@ <field> <fielddescr>Bypass proxy for these source IPs</fielddescr> <fieldname>defined_ip_proxy_off</fieldname> - <description>Do not forward traffic from these <b>source</b> IPs, hostnames, or aliases through the proxy server but directly through the firewall. Separate by semi-colons (;).</description> + <description>Do not forward traffic from these <b>source</b> IPs, hostnames, or aliases through the proxy server but directly through the firewall. Separate by semi-colons (;). [Applies only to transparent mode]</description> <type>input</type> <size>80</size> </field> <field> <fielddescr>Bypass proxy for these destination IPs</fielddescr> <fieldname>defined_ip_proxy_off_dest</fieldname> - <description>Do not proxy traffic going to these <b>destination</b> IPs, hostnames, or aliases, but let it pass directly through the firewall. Separate by semi-colons (;).</description> + <description>Do not proxy traffic going to these <b>destination</b> IPs, hostnames, or aliases, but let it pass directly through the firewall. Separate by semi-colons (;). [Applies only to transparent mode]</description> <type>input</type> <size>80</size> </field> |