From ce1d2edaff8d81212768c0794cfde49953630500 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 18 Sep 2015 13:42:43 +0200 Subject: squid3 - move min/max_object_size directives (Bug #5154) --- config/squid3/34/squid.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc index e5eb2f6c..2fb37063 100755 --- a/config/squid3/34/squid.inc +++ b/config/squid3/34/squid.inc @@ -1142,9 +1142,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 39aae1e79d682ba8f1e6d2f9af238842c7b9581c Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 18 Sep 2015 13:44:07 +0200 Subject: Bump squid3 package version --- pkg_config.10.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg_config.10.xml b/pkg_config.10.xml index bf6a4a44..0dff7455 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1052,7 +1052,7 @@ https://forum.pfsense.org/index.php/topic,48347.0.html http://www.squid-cache.org/ Network - 0.3.2 + 0.3.3 beta 2.2 marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org -- cgit v1.2.3 From 1442c7e14b09e2af7207166d764e291fa152a5fc Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 18 Sep 2015 13:55:22 +0200 Subject: Fix typo breaking squidantivirus XMLRPC sync (Bug #4452) --- config/squid3/34/squid.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc index 2fb37063..ccaba7c4 100755 --- a/config/squid3/34/squid.inc +++ b/config/squid3/34/squid.inc @@ -2390,7 +2390,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 415680944f58615b3a896b629b3e0525e1165b7d Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 18 Sep 2015 18:09:39 +0200 Subject: squid3 - 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/34/squid.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc index ccaba7c4..ec30910f 100755 --- a/config/squid3/34/squid.inc +++ b/config/squid3/34/squid.inc @@ -1073,7 +1073,8 @@ function squid_resync_cache() { $conf.='acl dynamic urlpath_regex cgi-bin \?'."\n"; $conf.="cache deny dynamic\n"; } else if (preg_match('/youtube/',$settings['refresh_patterns'])) { - $conf.=<<< EOC +// 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 @@ -1082,6 +1083,7 @@ acl youtube dstdomain .youtube.com cache allow youtube EOC; +*/ } if (preg_match('/windows/',$settings['refresh_patterns'])) { $conf.=<<< EOC -- cgit v1.2.3 From 2412edf89ae748261ba2799ff6d81e1643c5377a Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 18 Sep 2015 18:13:34 +0200 Subject: squid3 - 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/34/squid_cache.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/squid3/34/squid_cache.xml b/config/squid3/34/squid_cache.xml index f9204d46..3b2cd406 100755 --- a/config/squid3/34/squid_cache.xml +++ b/config/squid3/34/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