[SCM] Debian packaging for apache2 branch, next, updated. debian/2.4.2-2-29-g8597e57

[Arno Töll]

The following commit has been merged in the next branch:
commit 8597e577594aae604ab9531ef43dc7cbd9838d44
Author: Arno Töll <arno at debian.org>
Date:   Thu Jul 26 17:13:25 2012 +0200

    Change disk_cache defaults to close #6878740
    
    Conflicts:
    
    	debian/config-dir/mods-available/disk_cache.conf

diff --git a/debian/changelog b/debian/changelog
index ca6f070..54a2a52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,10 @@ apache2 (2.4.2-3) UNRELEASED; urgency=low
     visual feedback when fancy output is in use.
   * Drop the dbmanage tool from apache2-utils. It is mostly unmaintained and
     outdated. Users of mod_authn_dbm should use htdbm instead.
+  * Fix "Default /etc/apache2/mods-available/disk_cache.conf is incompatible
+    with ext3" by changing the default to more moderate values. Note, some file
+    systems have a hard limit of supported subdirectories (Closes: #682840).
+    Ported from our 2.2 tree targeted for Wheezy.
 
  -- Arno Töll <arno at debian.org>  Mon, 23 Jul 2012 23:47:12 +0200
 
diff --git a/debian/config-dir/mods-available/cache_disk.conf b/debian/config-dir/mods-available/cache_disk.conf
index 88232f9..862069c 100644
--- a/debian/config-dir/mods-available/cache_disk.conf
+++ b/debian/config-dir/mods-available/cache_disk.conf
@@ -14,8 +14,13 @@
 	# put this into the configuration for just one virtual host.
 	#CacheEnable disk /
 
-	CacheDirLevels 5
-	CacheDirLength 3
+
+    # The result of CacheDirLevels * CacheDirLength must not be higher than
+    # 20. Moreover, pay attention on file system limits. Some file systems
+    # do not support more than a certain number of inodes and
+    # subdirectories (e.g. 32000 for ext3)
+    CacheDirLevels 3
+    CacheDirLength 5
 
 </IfModule>
 

-- 
Debian packaging for apache2