packages: apache/apache-mod_cache.conf - mod_disk_cache renamed to mod_cach...

[adamg]

Author: adamg                        Date: Sun Feb 26 09:25:20 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- mod_disk_cache renamed to mod_cache_disk
- mod_mem_cache removed in 2.3.0

---- Files affected:
packages/apache:
   apache-mod_cache.conf (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/apache/apache-mod_cache.conf
diff -u packages/apache/apache-mod_cache.conf:1.6 packages/apache/apache-mod_cache.conf:1.7
--- packages/apache/apache-mod_cache.conf:1.6	Fri Oct 30 15:15:21 2009
+++ packages/apache/apache-mod_cache.conf	Sun Feb 26 10:25:14 2012
@@ -5,15 +5,12 @@
 #
 
 <IfModule mod_cache.c>
-	# If you want to use mod_disk_cache instead of mod_mem_cache,
-	# just swap the two loadmodule comments.
-#	LoadModule disk_cache_module modules/mod_disk_cache.so
-	LoadModule mem_cache_module modules/mod_mem_cache.so
+	LoadModule cache_disk_module modules/mod_cache_disk.so
 
 	# prevent apache from cacheing cookies
 	CacheIgnoreHeaders Set-Cookie
 
-	<IfModule mod_disk_cache.c>
+	<IfModule mod_cache_disk.c>
 		CacheRoot "/var/cache/httpd"
 		CacheEnable disk /
 		CacheDirLevels 5
@@ -23,14 +20,6 @@
 #		CacheMinExpire 3600
 #		CacheMinFileSize 64
 #		CacheMaxFileSize 64000
-	</IfModule>
-
-	<IfModule mod_mem_cache.c>
-		CacheEnable mem /
-		MCacheSize 4096
-		MCacheMaxObjectCount 100
-		MCacheMinObjectSize 1
-		MCacheMaxObjectSize 2048
 	</IfModule>
 
 	# When acting as a proxy, don't cache the list of security updates
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache-mod_cache.conf?r1=1.6&r2=1.7&f=u