aboutsummaryrefslogtreecommitdiffstats
path: root/config/squid3
diff options
context:
space:
mode:
Diffstat (limited to 'config/squid3')
-rw-r--r--config/squid3/31/squid.inc2
-rwxr-xr-xconfig/squid3/33/squid.inc7
-rwxr-xr-xconfig/squid3/33/squid_cache.xml4
-rwxr-xr-xconfig/squid3/34/squid.inc8
-rwxr-xr-xconfig/squid3/34/squid_cache.xml4
5 files changed, 15 insertions, 10 deletions
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;
diff --git a/config/squid3/33/squid.inc b/config/squid3/33/squid.inc
index 669ae2f3..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
@@ -1125,9 +1128,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 +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'];
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 @@
<field>
<fielddescr>Refresh Patterns</fielddescr>
<fieldname>refresh_patterns</fieldname>
- <description><![CDATA[With dynamic cache enabled, you can also apply squid wiki refresh_patterns to sites like <a target=_new href='http://wiki.squid-cache.org/ConfigExamples/DynamicContent/YouTube'>Youtube</a> and <a target=_new href='http://wiki.squid-cache.org/SquidFaq/WindowsUpdate'>windowsupdate</a><br>
+ <description><![CDATA[With dynamic cache enabled, you can also apply squid wiki refresh_patterns to sites like <a target=_new href='http://wiki.squid-cache.org/SquidFaq/WindowsUpdate'>windowsupdate</a><br>
<br><strong>Notes:</strong><br>
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.<br><br>
set Maximum download size on 'traffic mgmt' squid tab to a value that fits patterns your are applying.<br>Microsoft may need 200Mb and youtube 4GB.]]></description>
<type>select</type>
<default_value>none</default_value>
<options>
- <option><name>Youtube</name><value>youtube</value></option>
+ <!--<option><name>Youtube</name><value>youtube</value></option>-->
<option><name>Windows Update</name><value>windows</value></option>
<option><name>Symantec Antivirus</name><value>symantec</value></option>
<option><name>Avira</name><value>avira</value></option>
diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc
index e5eb2f6c..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
@@ -1142,9 +1144,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;
@@ -2390,7 +2392,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'];
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 @@
<field>
<fielddescr>Refresh Patterns</fielddescr>
<fieldname>refresh_patterns</fieldname>
- <description><![CDATA[With dynamic cache enabled, you can also apply squid wiki refresh_patterns to sites like <a target=_new href='http://wiki.squid-cache.org/ConfigExamples/DynamicContent/YouTube'>Youtube</a> and <a target=_new href='http://wiki.squid-cache.org/SquidFaq/WindowsUpdate'>windowsupdate</a><br>
+ <description><![CDATA[With dynamic cache enabled, you can also apply squid wiki refresh_patterns to sites like <a target=_new href='http://wiki.squid-cache.org/SquidFaq/WindowsUpdate'>windowsupdate</a><br>
<br><strong>Notes:</strong><br>
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.<br><br>
set Maximum download size on 'traffic mgmt' squid tab to a value that fits patterns your are applying.<br>Microsoft may need 200Mb and youtube 4GB.]]></description>
<type>select</type>
<default_value>none</default_value>
<options>
- <option><name>Youtube</name><value>youtube</value></option>
+ <!--<option><name>Youtube</name><value>youtube</value></option>-->
<option><name>Windows Update</name><value>windows</value></option>
<option><name>Symantec Antivirus</name><value>symantec</value></option>
<option><name>Avira</name><value>avira</value></option>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-25 18:45:15 +0000