Commit 5e68dffd authored by David Shane Holden's avatar David Shane Holden
Browse files

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
parent 7f57a9a8

docs/conf/httpd.conf.in

+10 −0
Changes for docs/conf/httpd.conf.in: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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>



#