[apache2] 02/06: 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 jessie
in repository apache2.

commit 8149bd443ec631a534c991056f3728ba33933c5d
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 ++--
 1 file changed, 2 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);
 			}

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