diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2015-10-24 21:50:41 +0200 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2015-10-24 21:57:11 +0200 |
| commit | 34e75cca19f1eca1355343a503e3fcfe1c36a06a (patch) | |
| tree | 3c34144381864444f9021616ca9cb139b834452d | |
| parent | f05213b1d39abb175bb260fe820f9377422c8065 (diff) | |
| download | apache2-34e75cca19f1eca1355343a503e3fcfe1c36a06a.tar.gz | |
Don't treat mpm_itk as MPM module in a2query
| -rwxr-xr-x | debian/a2query.in | 4 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/a2query.in b/debian/a2query.in index 555ea1d3..88a668eb 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 cf50f8d0..5b10432a 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. |