aboutsummaryrefslogtreecommitdiffstats
path: root/packages/squid3/squid.inc
diff options
context:
space:
mode:
authorMartin Fuchs <mfuchs@pfsense.org>2008-08-24 19:09:33 +0000
committerMartin Fuchs <mfuchs@pfsense.org>2008-08-24 19:09:33 +0000
commit6182ddebe44b3c741ff3fbb7f299f85463fca686 (patch)
treedde2f9b77625487fbfff53864dd2f44efc2efc91 /packages/squid3/squid.inc
parent997109c592ade388b7548b21e9bb7ae4901d9513 (diff)
downloadpfsense-packages-6182ddebe44b3c741ff3fbb7f299f85463fca686.tar.gz
pfsense-packages-6182ddebe44b3c741ff3fbb7f299f85463fca686.tar.bz2
pfsense-packages-6182ddebe44b3c741ff3fbb7f299f85463fca686.zip
ticket: 1806 fixed
Diffstat (limited to 'packages/squid3/squid.inc')
-rw-r--r--packages/squid3/squid.inc10
1 files changed, 8 insertions, 2 deletions
diff --git a/packages/squid3/squid.inc b/packages/squid3/squid.inc
index 5298f7ad..7c816ce2 100644
--- a/packages/squid3/squid.inc
+++ b/packages/squid3/squid.inc
@@ -619,7 +619,10 @@ EOD;
$conf .= 'acl donotcache dstdomain "' . SQUID_ACLDIR . "/donotcache.acl\"\n";
$conf .= 'cache deny donotcache';
}
-
+ elseif (file_exists(SQUID_ACLDIR . '/donotcache.acl')) {
+ unlink(SQUID_ACLDIR . '/donotcache.acl');
+ }
+
return $conf;
}
@@ -655,7 +658,7 @@ function squid_resync_redirector() {
function squid_resync_nac() {
global $config, $valid_acls;
- $port = ($settings['proxy_port'] ? $settings['proxy_port'] : 3128);
+ $port = ($settings['proxy_port'] ? $settings['proxy_port'] : 3128);
$settings = $config['installedpackages']['squidnac']['config'][0];
$webgui_port = $config['system']['webgui']['port'];
@@ -697,6 +700,9 @@ EOD;
$conf .= "acl $option $directive \"" . SQUID_ACLDIR . "/$option.acl\"\n";
$valid_acls[] = $option;
}
+ elseif (file_exists(SQUID_ACLDIR . "/$option.acl")) {
+ unlink(SQUID_ACLDIR . "/$option.acl");
+ }
}
$conf .= <<<EOD