aboutsummaryrefslogtreecommitdiffstats
path: root/main/apache2/conf/0012-httpd.conf-MIMEMagicFile.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/apache2/conf/0012-httpd.conf-MIMEMagicFile.patch')
-rw-r--r--main/apache2/conf/0012-httpd.conf-MIMEMagicFile.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/main/apache2/conf/0012-httpd.conf-MIMEMagicFile.patch b/main/apache2/conf/0012-httpd.conf-MIMEMagicFile.patch
new file mode 100644
index 0000000000..c83694eaf7
--- /dev/null
+++ b/main/apache2/conf/0012-httpd.conf-MIMEMagicFile.patch
@@ -0,0 +1,27 @@
+From 8496740e67572c4f0db4f06b6496bbe8b85e4e7b Mon Sep 17 00:00:00 2001
+From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+Date: Fri, 11 Sep 2015 14:59:32 +0300
+Subject: [PATCH 12/14] httpd.conf: MIMEMagicFile
+
+---
+ docs/conf/httpd.conf.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in
+index 545e663..c6092b3 100644
+--- a/docs/conf/httpd.conf.in
++++ b/docs/conf/httpd.conf.in
+@@ -341,7 +341,9 @@ LogLevel warn
+ # contents of the file itself to determine its type. The MIMEMagicFile
+ # directive tells the module where the hint definitions are located.
+ #
+-#MIMEMagicFile @rel_sysconfdir@/magic
++<IfModule mime_magic_module>
++ MIMEMagicFile @rel_sysconfdir@/magic
++</IfModule>
+
+ #
+ # Customizable error responses come in three flavors:
+--
+2.5.0
+