Add 'AuthzMergeRules Off' and a note to the default httpd.conf.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@676091 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in
index ef3f3adefe04e3a90a1a7df84937d009afba4b0b..1da6390bb1b74b27b572fffc6c86535fffc87d82 100644 (file)
--- a/docs/conf/httpd.conf.in
+++ b/docs/conf/httpd.conf.in
@@ -155,6 +155,16 @@ DocumentRoot "@exp_htdocsdir@"
     #
     Require all granted
 
+    #
+    # <Directory> and <Location> directives inherit their parent's authorization
+    # rules and applies them using AND logic instead of the previous OR logic of
+    # Apache 2.2 and before.  To disable the merging of these rules use
+    # "AuthzMergeRules Off".
+    #
+    # This prevents the "Require all denied" rule in "<Directory />" above
+    # from being included in this directory's configuration.
+    #
+    AuthzMergeRules Off
 </Directory>
 
 #