summaryrefslogtreecommitdiff
path: root/www/apache24/files/patch-docs__conf__httpd.conf.in
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache24/files/patch-docs__conf__httpd.conf.in')
-rw-r--r--www/apache24/files/patch-docs__conf__httpd.conf.in15
1 files changed, 5 insertions, 10 deletions
diff --git a/www/apache24/files/patch-docs__conf__httpd.conf.in b/www/apache24/files/patch-docs__conf__httpd.conf.in
index a246f6924ce0..244f0267d06d 100644
--- a/www/apache24/files/patch-docs__conf__httpd.conf.in
+++ b/www/apache24/files/patch-docs__conf__httpd.conf.in
@@ -1,5 +1,5 @@
--- ./docs/conf/httpd.conf.in.orig 2012-11-08 04:05:38.000000000 +0100
-+++ ./docs/conf/httpd.conf.in 2013-03-22 18:55:53.000000000 +0100
++++ ./docs/conf/httpd.conf.in 2013-10-26 19:29:20.000000000 +0200
@@ -74,8 +74,8 @@
# It is usually good practice to create a dedicated user and group for
# running httpd, as with most system services.
@@ -36,14 +36,9 @@
</IfModule>
<IfModule alias_module>
-@@ -406,7 +406,9 @@
- SSLRandomSeed startup builtin
- SSLRandomSeed connect builtin
- </IfModule>
--#
-+
+@@ -418,3 +418,5 @@
+ #RequestHeader unset DNT env=bad_DNT
+ #</IfModule>
+
+Include @rel_sysconfdir@/Includes/*.conf
+
- # uncomment out the below to deal with user agents that deliberately
- # violate open standards by misusing DNT (DNT *must* be a specific
- # end-user choice)