aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordoktornotor <notordoktor@gmail.com>2015-09-18 13:58:58 +0200
committerdoktornotor <notordoktor@gmail.com>2015-09-18 13:58:58 +0200
commit4562685fa753b9c1c002ca3bd3464c4f059ecdab (patch)
tree75021eac103388c5b60d0d9ec8d05d006f56ae34
parent1233f9e1e4f35c0034352a148715ffd15387f760 (diff)
downloadpfsense-packages-4562685fa753b9c1c002ca3bd3464c4f059ecdab.tar.gz
pfsense-packages-4562685fa753b9c1c002ca3bd3464c4f059ecdab.tar.bz2
pfsense-packages-4562685fa753b9c1c002ca3bd3464c4f059ecdab.zip
squid3 - move min/max_object_size directives (Bug #5154), fix typo breaking squidantivirus XMLRPC sync (Bug #4452)
-rwxr-xr-xconfig/squid3/33/squid.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/squid3/33/squid.inc b/config/squid3/33/squid.inc
index 669ae2f3..9aa1eb46 100755
--- a/config/squid3/33/squid.inc
+++ b/config/squid3/33/squid.inc
@@ -1125,9 +1125,9 @@ cache_mem $memory_cache_size MB
maximum_object_size_in_memory {$max_objsize_in_mem} KB
memory_replacement_policy {$memory_policy}
cache_replacement_policy {$cache_policy}
-$disk_cache_opts
minimum_object_size {$min_objsize} KB
maximum_object_size {$max_objsize}
+$disk_cache_opts
offline_mode {$offline_mode}
EOD;
@@ -2387,7 +2387,7 @@ function squid_do_xmlrpc_sync($sync_to_ip, $username, $password, $synctimeout) {
$xml['squid'] = $config['installedpackages']['squid'];
$xml['squidupstream'] = $config['installedpackages']['squidupstream'];
$xml['squidcache'] = $config['installedpackages']['squidcache'];
- $xml['squidantivirus'] = $config['installedpackages']['squidanitivirus'];
+ $xml['squidantivirus'] = $config['installedpackages']['squidantivirus'];
$xml['squidnac'] = $config['installedpackages']['squidnac'];
$xml['squidtraffic'] = $config['installedpackages']['squidtraffic'];
$xml['squidreversegeneral'] = $config['installedpackages']['squidreversegeneral'];