From 4562685fa753b9c1c002ca3bd3464c4f059ecdab Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 18 Sep 2015 13:58:58 +0200 Subject: squid3 - move min/max_object_size directives (Bug #5154), fix typo breaking squidantivirus XMLRPC sync (Bug #4452) --- config/squid3/33/squid.inc | 4 ++-- 1 file 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']; -- cgit v1.2.3 From e1d7716da96fb1ecf05cd6f912ba861cedbabac5 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 18 Sep 2015 14:05:06 +0200 Subject: squid3 - move min/max_object_size directives (Bug #5154) --- config/squid3/31/squid.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/squid3/31/squid.inc b/config/squid3/31/squid.inc index e6de88c4..d565810c 100644 --- a/config/squid3/31/squid.inc +++ b/config/squid3/31/squid.inc @@ -976,9 +976,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; -- cgit v1.2.3 From 093e2d5b87f87439b32b7a0b4826f49c95a88e77 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 18 Sep 2015 14:06:44 +0200 Subject: Bump squid3/squid3-dev package versions --- pkg_config.8.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 382155a8..66b085c3 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1140,7 +1140,7 @@ https://forum.pfsense.org/index.php/topic,48347.0.html http://www.squid-cache.org/ Network - 3.1.20 pkg 2.1.2 + 3.1.20 pkg 2.1.3 beta 2.0 marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org @@ -1167,7 +1167,7 @@ https://forum.pfsense.org/index.php/topic,48347.0.html http://www.squid-cache.org/ Network - 3.3.10 pkg 2.2.8 + 3.3.10 pkg 2.2.9 beta 2.0 marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org -- cgit v1.2.3 From a1220dd68b3dbd6b2198e789c1b2463111f14b72 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 18 Sep 2015 14:07:33 +0200 Subject: Bump squid3/squid3-dev package versions --- pkg_config.8.xml.amd64 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 88608bff..2ee44b5d 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1127,7 +1127,7 @@ https://forum.pfsense.org/index.php/topic,48347.0.html http://www.squid-cache.org/ Network - 3.1.20 pkg 2.1.2 + 3.1.20 pkg 2.1.3 beta 2.0 marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org @@ -1154,7 +1154,7 @@ https://forum.pfsense.org/index.php/topic,48347.0.html http://www.squid-cache.org/ Network - 3.3.10 pkg 2.2.8 + 3.3.10 pkg 2.2.9 beta 2.0 marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org -- cgit v1.2.3 From 1a4c1710f25933e38a6d25a6220a5b7cf2967df4 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 18 Sep 2015 18:21:57 +0200 Subject: squid3-dev - disable broken Youtube caching feature Broken (Bug #3847) and not working anyway because of how YT works (http://wiki.squid-cache.org/ConfigExamples/DynamicContent/YouTube#Discussion) --- config/squid3/33/squid.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/squid3/33/squid.inc b/config/squid3/33/squid.inc index 9aa1eb46..73be7162 100755 --- a/config/squid3/33/squid.inc +++ b/config/squid3/33/squid.inc @@ -1055,6 +1055,8 @@ if(empty($settings['cache_dynamic_content'])){ } else{ if(preg_match('/youtube/',$settings['refresh_patterns'])){ + // Broken (Bug #3847) and not working (http://wiki.squid-cache.org/ConfigExamples/DynamicContent/YouTube#Discussion) + /* $conf.=<<< EOC # Break HTTP standard for flash videos. Keep them in cache even if asked not to. refresh_pattern -i \.flv$ 10080 90% 999999 ignore-no-cache override-expire ignore-private @@ -1064,6 +1066,7 @@ acl youtube dstdomain .youtube.com cache allow youtube EOC; +*/ } if(preg_match('/windows/',$settings['refresh_patterns'])){ $conf.=<<< EOC -- cgit v1.2.3 From 76ddc3a7a8e2faee8c6a8552ee53c793228f7b21 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 18 Sep 2015 18:23:59 +0200 Subject: squid3-dev - disable broken Youtube caching feature Broken (Bug #3847) and not working anyway because of how YT works (http://wiki.squid-cache.org/ConfigExamples/DynamicContent/YouTube#Discussion) --- config/squid3/33/squid_cache.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/squid3/33/squid_cache.xml b/config/squid3/33/squid_cache.xml index 612e9b73..34115f5e 100755 --- a/config/squid3/33/squid_cache.xml +++ b/config/squid3/33/squid_cache.xml @@ -280,14 +280,14 @@ Refresh Patterns refresh_patterns - Youtube and windowsupdate
+ windowsupdate

Notes:
Squid wiki suggests 'Finish transfer if less than x KB remaining' on 'traffic mgmt' squid tab to -1 but you can apply your own values to control cache.

set Maximum download size on 'traffic mgmt' squid tab to a value that fits patterns your are applying.
Microsoft may need 200Mb and youtube 4GB.]]> select none - + -- cgit v1.2.3