diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2015-09-11 14:52:18 +0300 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2015-12-15 11:31:36 +0200 |
| commit | dfb1e11b9edcfe9876e8130da45d06cb31d6fa03 (patch) | |
| tree | 756a50f5dafc8a753821d56f537dec97b76532fb /main/apache2/conf/0012-httpd.conf-MIMEMagicFile.patch | |
| parent | 96e51aae7baf5ac9bdbc14bdada5e3f1c8d404f6 (diff) | |
| download | aports-dfb1e11b9edcfe9876e8130da45d06cb31d6fa03.tar.bz2 aports-dfb1e11b9edcfe9876e8130da45d06cb31d6fa03.tar.xz | |
main/apache2: base configuration on upstream default files
Diffstat (limited to 'main/apache2/conf/0012-httpd.conf-MIMEMagicFile.patch')
| -rw-r--r-- | main/apache2/conf/0012-httpd.conf-MIMEMagicFile.patch | 27 |
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 + |