From 0966f6a152bea646cdd89c6012bbaeef5533ce19 Mon Sep 17 00:00:00 2001
From: Marcello Coutinho <marcellocoutinho@gmail.com>
Date: Mon, 16 Apr 2012 07:22:52 +0000
Subject: squid3 - version 2.0.3 with dynamic content options on cache tab

---
 config/squid-reverse/squid.inc       | 81 +++++++++++++++++++++++++++++-------
 config/squid-reverse/squid_cache.xml | 31 ++++++++++++++
 pkg_config.8.xml                     |  2 +-
 pkg_config.8.xml.amd64               |  2 +-
 4 files changed, 100 insertions(+), 16 deletions(-)

diff --git a/config/squid-reverse/squid.inc b/config/squid-reverse/squid.inc
index 408ecb7a..f4939201 100644
--- a/config/squid-reverse/squid.inc
+++ b/config/squid-reverse/squid.inc
@@ -825,13 +825,14 @@ function squid_resync_cache() {
 	$disk_cache_size = ($settings['harddisk_cache_size'] ? $settings['harddisk_cache_size'] : 100);
 	$level1 = ($settings['level1_subdirs'] ? $settings['level1_subdirs'] : 16);
 	$memory_cache_size = ($settings['memory_cache_size'] ? $settings['memory_cache_size'] : 8);
-	$max_objsize = ($settings['maximum_object_size'] ? $settings['maximum_object_size'] : 10);
+	$max_objsize = ($settings['maximum_object_size'] ? $settings['maximum_object_size']." KB" : "10 KB");
 	$min_objsize = ($settings['minimum_object_size'] ? $settings['minimum_object_size'] : 0);
 	$max_objsize_in_mem = ($settings['maximum_objsize_in_mem'] ? $settings['maximum_objsize_in_mem'] : 32);
 	$cache_policy = ($settings['cache_replacement_policy'] ? $settings['cache_replacement_policy'] : 'heap LFUDA');
 	$memory_policy = ($settings['memory_replacement_policy'] ? $settings['memory_replacement_policy'] : 'heap GDSF');
 	$offline_mode = ($settings['enable_offline'] == 'on' ? 'on' : 'off');
-
+	$conf = '';
+	
 	if (!isset($settings['harddisk_cache_system'])) {
 		if ($g['platform'] == "nanobsd") {
 			$disk_cache_system = 'null';
@@ -845,17 +846,71 @@ function squid_resync_cache() {
 	if ($disk_cache_system != "null") {
 		$disk_cache_opts =	"cache_dir {$disk_cache_system} {$cachedir} {$disk_cache_size} {$level1} 256";
 	}
+//check dynamic content
+if(empty($settings['cache_dynamic_content'])){
+	$conf.='acl dynamic urlpath_regex cgi-bin \?'."\n";
+	$conf.="cache deny dynamic\n";
+}
+else{
+	if(preg_match('/youtube/',$settings['refresh_patters'])){
+		$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
+
+# Let the clients favorite video site through with full caching
+acl youtube dstdomain .youtube.com
+cache allow youtube
+
+EOC;
+	}
+	if(preg_match('/windows/',$settings['refresh_patters'])){
+		$conf.=<<<EOC
+range_offset_limit -1
+refresh_pattern -i microsoft.com/.*\.(cab|exe|ms[i|u|f]|asf|wm[v|a]|dat|zip) 4320 80% 43200 reload-into-ims
+refresh_pattern -i windowsupdate.com/.*\.(cab|exe|ms[i|u|f]|asf|wm[v|a]|dat|zip) 4320 80% 43200 reload-into-ims
+refresh_pattern -i my.windowsupdate.website.com/.*\.(cab|exe|ms[i|u|f]|asf|wm[v|a]|dat|zip) 4320 80% 43200 reload-into-ims
+EOC;
+		}
 
-	$conf = <<<EOD
+if(preg_match('/symantec/',$settings['refresh_patters'])){
+		$conf.=<<<EOC
+range_offset_limit -1
+refresh_pattern liveupdate.symantecliveupdate.com/.*\.(cab|exe|dll|msi) 10080 100% 43200 reload-into-ims
+refresh_pattern symantecliveupdate.com/.*\.(cab|exe|dll|msi) 10080 100% 43200 reload-into-ims
+EOC;
+		}
+if(preg_match('/avast/',$settings['refresh_patters'])){
+		$conf.=<<<EOC
+range_offset_limit -1
+refresh_pattern avast.com/.*\.(vpu|cab|stamp|exe) 10080 100% 43200 reload-into-ims
+EOC;
+		}
+if(preg_match('/avira/',$settings['refresh_patters'])){
+		$conf.=<<<EOC
+range_offset_limit -1
+refresh_pattern personal.avira-update.com/.*\.(cab|exe|dll|msi|gz) 10080 100% 43200 reload-into-ims
+EOC;
+		}		
+		
+	$refresh_conf=<<<EOC
+# Add any of your own refresh_pattern entries above these.
+refresh_pattern ^ftp:		1440	20%	10080
+refresh_pattern ^gopher:	1440	0%	1440
+refresh_pattern -i (/cgi-bin/|\?) 0	0%	0
+refresh_pattern .		0	20%	4320
+EOC;
+	
+	}
+	
+	$conf .= <<<EOD
 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
+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 KB
-offline_mode $offline_mode
-
+minimum_object_size {$min_objsize} KB
+maximum_object_size {$max_objsize}
+offline_mode {$offline_mode}
 EOD;
 
 	if (!empty($settings['cache_swap_low'])) $conf .= "cache_swap_low {$settings['cache_swap_low']}\n";
@@ -870,8 +925,7 @@ EOD;
 	elseif (file_exists(SQUID_ACLDIR . '/donotcache.acl')) {
      unlink(SQUID_ACLDIR . '/donotcache.acl');
     }
-  
-	return $conf;
+	return $conf.$refresh_conf;
 }
 
 function squid_resync_upstream() {
@@ -926,7 +980,7 @@ acl sslports port 443 563 $webgui_port $addtl_sslports
 acl manager proto cache_object
 acl purge method PURGE
 acl connect method CONNECT
-acl dynamic urlpath_regex cgi-bin \?
+
 
 EOD;
 
@@ -961,7 +1015,6 @@ EOD;
 	}
 
 	$conf .= <<<EOD
-cache deny dynamic
 http_access allow manager localhost
 
 EOD;
diff --git a/config/squid-reverse/squid_cache.xml b/config/squid-reverse/squid_cache.xml
index ce7bd585..d0e6ffac 100644
--- a/config/squid-reverse/squid_cache.xml
+++ b/config/squid-reverse/squid_cache.xml
@@ -245,6 +245,37 @@
 				<option><name>Heap LRU</name><value>heap LRU</value></option>
 			</options>
 		</field>
+		<field>
+			<name>Dynamic and Update Content</name>
+			<type>listtopic</type>
+		</field>
+		<field>
+			<fielddescr>Cache Dynamic Content</fielddescr>
+			<fieldname>cache_dynamic_content</fieldname>
+			<description><![CDATA[Select this option to <a target=_new href='http://wiki.squid-cache.org/ConfigExamples/DynamicContent'>enable caching of dynamic content.</a><br>
+								 ]]></description>
+			<type>checkbox</type>
+			<size>10</size>
+		</field>
+		<field>
+			<fielddescr>Refresh Patters</fielddescr>
+			<fieldname>refresh_patters</fieldname>
+			<description><![CDATA[Once enabling dynamic cache, also apply squid wiki refresh_patters 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>
+			<br><strong>Notes:</strong><br>
+			set 'Finish transfer if less than x KB remaining' on 'traffic mgmt' squid tab to -1 when applying these patters.<br><br>
+			set Maximum download size on 'traffic mgmt' squid tab to a value that fits patters 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>Windows Update</name><value>windows</value></option>
+				<option><name>Symantec Antivirus</name><value>symantec</value></option>
+				<option><name>Avira</name><value>avira</value></option>
+				<option><name>Avast</name><value>avast</value></option>
+			</options>
+			<multiple/>
+			<size>06</size>
+		</field>		
 	</fields>
 	<custom_php_command_before_form>
 		if($_POST['harddisk_cache_size'] != $config['installedpackages']['squidcache']['config'][0]['harddisk_cache_size']) {
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 43e02cfb..a83e6a1a 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1010,7 +1010,7 @@
 		<pkginfolink>http://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink>
 		<website>http://www.squid-cache.org/</website>
 		<category>Network</category>
-		<version>3.1.19 pkg 2.0.2</version>
+		<version>3.1.19 pkg 2.0.3</version>
 		<status>RC1</status>
 		<required_version>2.0</required_version>
 		<maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index b329b4cd..405261d9 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -118,7 +118,7 @@
 		<pkginfolink>http://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink>
 		<website>http://www.squid-cache.org/</website>
 		<category>Network</category>
-		<version>3.1.19 pkg 2.0.2</version>
+		<version>3.1.19 pkg 2.0.3</version>
 		<status>Stable</status>
 		<required_version>2.0</required_version>
 		<maintainer>fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>
-- 
cgit v1.2.3