From f3b6742d9b6845015a35166ef9699e36a5139948 Mon Sep 17 00:00:00 2001
From: Jan Kaluza <hanzz.k@gmail.com>
Date: Mar 27 2013 08:42:23 +0000
Subject: protect MIMEMagicFile with IfModule (#893949)


---

diff --git a/httpd.conf b/httpd.conf
index fc7bf34..a7af0dc 100644
--- a/httpd.conf
+++ b/httpd.conf
@@ -315,12 +315,14 @@ LogLevel warn
 #
 AddDefaultCharset UTF-8
 
-#
-# The mod_mime_magic module allows the server to use various hints from the
-# contents of the file itself to determine its type.  The MIMEMagicFile
-# directive tells the module where the hint definitions are located.
-#
-MIMEMagicFile conf/magic
+<IfModule mime_magic_module>
+    #
+    # The mod_mime_magic module allows the server to use various hints from the
+    # contents of the file itself to determine its type.  The MIMEMagicFile
+    # directive tells the module where the hint definitions are located.
+    #
+    MIMEMagicFile conf/magic
+</IfModule>
 
 #
 # Customizable error responses come in three flavors:
diff --git a/httpd.spec b/httpd.spec
index 461f54f..4a56eda 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -14,7 +14,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: index.html
@@ -604,6 +604,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpm/macros.httpd
 
 %changelog
+* Tue Mar 26 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-3
+- protect MIMEMagicFile with IfModule (#893949)
+
 * Tue Feb 26 2013 Joe Orton <jorton@redhat.com> - 2.4.4-2
 - really package mod_auth_form in mod_session (#915438)