diff options
| author | Renato Botelho <renato@netgate.com> | 2015-09-21 08:42:13 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-09-21 08:42:13 -0300 |
| commit | f7d0bd06a37f3b55831dca97a63a1938e5dbea25 (patch) | |
| tree | 532d9af99ba4df8ccb685c0f739b20bf122dd4f0 | |
| parent | fb3f0e7c5276a850cfbdeeaa238b064c623c39ea (diff) | |
| parent | 2412edf89ae748261ba2799ff6d81e1643c5377a (diff) | |
| download | pfsense-packages-f7d0bd06a37f3b55831dca97a63a1938e5dbea25.tar.gz pfsense-packages-f7d0bd06a37f3b55831dca97a63a1938e5dbea25.tar.bz2 pfsense-packages-f7d0bd06a37f3b55831dca97a63a1938e5dbea25.zip | |
Merge pull request #1073 from doktornotor/patch-5
| -rwxr-xr-x | config/squid3/34/squid.inc | 8 | ||||
| -rwxr-xr-x | config/squid3/34/squid_cache.xml | 4 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 |
3 files changed, 8 insertions, 6 deletions
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> diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 57793cb6..bab5ef19 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1052,7 +1052,7 @@ <pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink> <website>http://www.squid-cache.org/</website> <category>Network</category> - <version>0.3.2</version> + <version>0.3.3</version> <status>beta</status> <required_version>2.2</required_version> <maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer> |