[apache2] 01/02: Guard AddOutputFilter INCLUDES with proper <IfModule>

[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 7a78809e85f7d8dfec2f2e171add8ce95b95e5b8
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon Aug 7 15:32:24 2017 +0200

    Guard AddOutputFilter INCLUDES with proper <IfModule>
---
 debian/changelog                           | 2 ++
 debian/config-dir/mods-available/mime.conf | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dbdb8e5..88693e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ apache2 (2.4.27-4) UNRELEASED; urgency=medium
   * deflate.conf: Remove mention of MSIE6
   * Make the apache-htcacheclean init script actually look into
     /etc/default/apache-htcacheclean for its config. LP: #1691495
+  * mime.conf: Guard AddOutputFilter INCLUDES with proper <IfModule>.
+    LP: #1675184
 
  -- Stefan Fritsch <sf at debian.org>  Sat, 05 Aug 2017 20:59:48 +0200
 
diff --git a/debian/config-dir/mods-available/mime.conf b/debian/config-dir/mods-available/mime.conf
index d1b1d89..37dac86 100644
--- a/debian/config-dir/mods-available/mime.conf
+++ b/debian/config-dir/mods-available/mime.conf
@@ -242,7 +242,9 @@
 	# (You will also need to add "Includes" to the "Options" directive.)
 	#
 	AddType text/html .shtml
+<IfModule mod_include.c>
 	AddOutputFilter INCLUDES .shtml
+</IfModule>
 
 </IfModule>
 

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