diff options
author | David Shane Holden <dpejesh@apache.org> | 2008-07-11 23:59:59 +0200 |
---|---|---|
committer | David Shane Holden <dpejesh@apache.org> | 2008-07-11 23:59:59 +0200 |
commit | 201cc0e2db257b77bbba3425e31e8e891fd4481a (patch) | |
tree | f2567aed85b0981796bee279e07a700d1f0e7cf1 /docs/conf/httpd.conf.in | |
parent | Use < instead of < in example code. (diff) | |
download | apache2-201cc0e2db257b77bbba3425e31e8e891fd4481a.tar.xz apache2-201cc0e2db257b77bbba3425e31e8e891fd4481a.zip |
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
Diffstat (limited to 'docs/conf/httpd.conf.in')
-rw-r--r-- | docs/conf/httpd.conf.in | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in index ef3f3adefe..1da6390bb1 100644 --- 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> # |