aboutsummaryrefslogtreecommitdiffstats
path: root/main/apache2/conf/0012-httpd.conf-MIMEMagicFile.patch
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2017-07-06 14:24:10 +0300
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2017-07-06 14:26:18 +0300
commitc930c29f44d1c8c27a01acc3e871b48922d3b620 (patch)
treed83bd75d0135874c118b8fb3d3f93bce90e893fe /main/apache2/conf/0012-httpd.conf-MIMEMagicFile.patch
parentba13c2bb464c773bf962da25426e9922be473839 (diff)
downloadaports-c930c29f44d1c8c27a01acc3e871b48922d3b620.tar.bz2
aports-c930c29f44d1c8c27a01acc3e871b48922d3b620.tar.xz
main/apache2: security upgrade to 2.4.26
fixes #7463
Diffstat (limited to 'main/apache2/conf/0012-httpd.conf-MIMEMagicFile.patch')
-rw-r--r--main/apache2/conf/0012-httpd.conf-MIMEMagicFile.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/main/apache2/conf/0012-httpd.conf-MIMEMagicFile.patch b/main/apache2/conf/0012-httpd.conf-MIMEMagicFile.patch
index 2db338d16f..4fa1911c23 100644
--- a/main/apache2/conf/0012-httpd.conf-MIMEMagicFile.patch
+++ b/main/apache2/conf/0012-httpd.conf-MIMEMagicFile.patch
@@ -1,4 +1,4 @@
-From 867d4c6caac66cb458316b97cd24761f339861ca Mon Sep 17 00:00:00 2001
+From e0eca7b6d1837ceee414e08698108fb35e79635e 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
@@ -8,10 +8,10 @@ Subject: [PATCH 12/14] httpd.conf: MIMEMagicFile
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in
-index 66d20fe..4266f87 100644
+index 388916f..61747cb 100644
--- a/docs/conf/httpd.conf.in
+++ b/docs/conf/httpd.conf.in
-@@ -341,7 +341,9 @@ LogLevel warn
+@@ -350,7 +350,9 @@ LogLevel warn
# contents of the file itself to determine its type. The MIMEMagicFile
# directive tells the module where the hint definitions are located.
#
@@ -23,5 +23,5 @@ index 66d20fe..4266f87 100644
#
# Customizable error responses come in three flavors:
--
-2.5.0
+2.9.4