[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. 1b061a0344c5f3cc459e769e2ad0e62be6f570cb

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit 734c2aa8c703b23fbed169079a6f42661dc73638
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Mar 17 17:36:02 2012 +0100

    Enable mod_filter on upgrade, note TODOs

diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index 5521bdf..e428fe1 100644
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -195,8 +195,9 @@ enable_default_mpm()
 #     demands it.
 enable_default_modules()
 {
+	# XXX different sets of modules depending on upgrade/new-install !!!
 	if is_fresh_install $@ || we_are_upgrading_from_squeeze $@; then
-		for module in authz_host alias cgi dir autoindex mime negotiation ; do
+		for module in authz_host alias filter cgi dir autoindex mime negotiation ; do
 			a2enmod -q $module
 		done
 	fi
@@ -336,6 +337,7 @@ migrate_data()
 
 guess_access_compat()
 {
+	# XXX problematic with htaccess files -> enable always?
 	if we_are_upgrading_from_squeeze $@ ; then
 		CONFS=""
 		if [ -f /etc/apache2/apache2.conf ] ; then

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)