aboutsummaryrefslogtreecommitdiffstats
path: root/main/apache2/conf/0011-httpd.conf-IncludeOptional.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/apache2/conf/0011-httpd.conf-IncludeOptional.patch')
-rw-r--r--main/apache2/conf/0011-httpd.conf-IncludeOptional.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/main/apache2/conf/0011-httpd.conf-IncludeOptional.patch b/main/apache2/conf/0011-httpd.conf-IncludeOptional.patch
index bc38c2753c..06ed346b5c 100644
--- a/main/apache2/conf/0011-httpd.conf-IncludeOptional.patch
+++ b/main/apache2/conf/0011-httpd.conf-IncludeOptional.patch
@@ -1,4 +1,4 @@
-From 1013806f1128c2cf289b20362484f64379dda619 Mon Sep 17 00:00:00 2001
+From 355485ecb874640c0856e4f3c239d517d97893df Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Fri, 11 Sep 2015 11:27:24 +0300
Subject: [PATCH 11/14] httpd.conf: IncludeOptional
@@ -8,10 +8,10 @@ Subject: [PATCH 11/14] httpd.conf: IncludeOptional
1 file changed, 2 insertions(+), 40 deletions(-)
diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in
-index de6ee33..66d20fe 100644
+index 46ccea6..388916f 100644
--- a/docs/conf/httpd.conf.in
+++ b/docs/conf/httpd.conf.in
-@@ -373,44 +373,6 @@ LogLevel warn
+@@ -382,44 +382,6 @@ LogLevel warn
#EnableMMAP off
#EnableSendfile on
@@ -59,5 +59,5 @@ index de6ee33..66d20fe 100644
-</IfModule>
+IncludeOptional /etc/apache2/conf.d/*.conf
--
-2.5.0
+2.9.4