[apache2] 01/03: Don't treat mpm_itk as MPM module in a2query

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apache2.

commit 34e75cca19f1eca1355343a503e3fcfe1c36a06a
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Oct 24 21:50:41 2015 +0200

    Don't treat mpm_itk as MPM module in a2query
---
 debian/a2query.in | 4 ++--
 debian/changelog  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/a2query.in b/debian/a2query.in
index 555ea1d..88a668e 100755
--- a/debian/a2query.in
+++ b/debian/a2query.in
@@ -209,10 +209,10 @@ sub load_modules
 		my $file = $_;
 		next if $file !~ m/\.load$/;
 		$file =~ s/\.load//;
-		if ($file =~ /mpm_(\w+)/ && $file ne 'mpm_itk')
+		if ($file =~ /mpm_(?:event|worker|prefork)/)
 		{
 			$MPM = $1 if $MPM eq 'invalid';
-			if(grep { $_ =~ m/^mpm_/ } @MODULES)
+			if(grep { $_ =~ m/^mpm_(?:event|worker|prefork)/ } @MODULES)
 			{
 				fail("There is more than one MPM loaded. Do not proceed due to undefined results", 1);
 			}
diff --git a/debian/changelog b/debian/changelog
index cf50f8d..5b10432 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ apache2 (2.4.17-1) UNRELEASED; urgency=medium
   * reproducible build: Make symbol sorting consistent over different locales
   * Conflict with apache2.2-common and apache2.2-bin to get the transitional
     packages removed. Closes: #768815
+  * Don't treat mpm_itk as MPM module in a2query. Closes: #791902
 
   [ Jean-Michel Vourgère ]
   * Updated upstream keyring used to check source authenticity.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git