aboutsummaryrefslogtreecommitdiffstats
path: root/config/squid3/squid.inc
diff options
context:
space:
mode:
Diffstat (limited to 'config/squid3/squid.inc')
-rw-r--r--config/squid3/squid.inc13
1 files changed, 1 insertions, 12 deletions
diff --git a/config/squid3/squid.inc b/config/squid3/squid.inc
index 417eaeae..784fea8f 100644
--- a/config/squid3/squid.inc
+++ b/config/squid3/squid.inc
@@ -286,7 +286,7 @@ function squid_deinstall_command() {
mwexec("ps awux | grep \"dnsserver\" | grep -v \"grep\" | awk '{ print $2 }' | xargs kill");
mwexec("ps awux | grep \"unlinkd\" | grep -v \"grep\" | awk '{ print $2 }' | xargs kill");
update_status("Reloading filter...");
- filter_configure_sync();
+ filter_configure();
}
function squid_before_form_general($pkg) {
@@ -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);