aboutsummaryrefslogtreecommitdiffstats
path: root/config/squid3
diff options
context:
space:
mode:
authorMartin Fuchs <martin.fuchs@trendchiller.com>2011-09-11 23:44:17 +0200
committerMartin Fuchs <martin.fuchs@trendchiller.com>2011-09-11 23:46:36 +0200
commit3f91755ba0a47bee174f15d165a09cb98e0be368 (patch)
tree77958eeaa21c3c6afa8e1d45484777f156412482 /config/squid3
parent4380f50f8a74fe7c7e4cd57a33f1384c1afd7224 (diff)
downloadpfsense-packages-3f91755ba0a47bee174f15d165a09cb98e0be368.tar.gz
pfsense-packages-3f91755ba0a47bee174f15d165a09cb98e0be368.tar.bz2
pfsense-packages-3f91755ba0a47bee174f15d165a09cb98e0be368.zip
squid: enable fields by depencency and comment out unneccessary checks
Diffstat (limited to 'config/squid3')
-rw-r--r--config/squid3/squid.inc2
-rw-r--r--config/squid3/squid.xml2
2 files changed, 3 insertions, 1 deletions
diff --git a/config/squid3/squid.inc b/config/squid3/squid.inc
index 417eaeae..1e720ae7 100644
--- a/config/squid3/squid.inc
+++ b/config/squid3/squid.inc
@@ -344,6 +344,7 @@ 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.";
}
@@ -354,6 +355,7 @@ function squid_validate_general($post, $input_errors) {
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) {
diff --git a/config/squid3/squid.xml b/config/squid3/squid.xml
index f07793bb..7d675265 100644
--- a/config/squid3/squid.xml
+++ b/config/squid3/squid.xml
@@ -166,7 +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</enablefields>
+ <enablefields>private_subnet_proxy_off,defined_ip_proxy_off,defined_ip_proxy_off_dest</enablefields>
<required/>
</field>
<field>