From 64bfcb97a4480a9379799c593b3b05a471832c8e Mon Sep 17 00:00:00 2001
From: Eric Covener <covener@apache.org>
Date: Sat, 22 Dec 2012 21:19:12 +0000
Subject: [PATCH] Merge r1425345 from
 https://svn.apache.org/repos/asf/httpd/httpd/trunk/:

caution about merging Location settings on top of directory/files authz config


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1425346 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/mod/mod_authz_core.html.en | 12 ++++++++++++
 docs/manual/mod/mod_authz_core.xml     | 13 +++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/docs/manual/mod/mod_authz_core.html.en b/docs/manual/mod/mod_authz_core.html.en
index c3f04c0f06..1a1f523004 100644
--- a/docs/manual/mod/mod_authz_core.html.en
+++ b/docs/manual/mod/mod_authz_core.html.en
@@ -500,6 +500,18 @@ Require group admin
     entire request, and subsequent <code class="directive">Require</code> directives
     are ignored.</p>
 
+    <div class="warning"><h3>Security Warning</h3>
+    <p>Exercise caution when setting authorization directives in
+    <code class="directive"><a href="../mod/core.html#location">Location</a></code> sections
+    that overlap with content served out of the filesystem.  
+    By default, these <a href="../sections.html#mergin">configuration sections</a> overwrite authorization configuration
+    in <code class="directive"><a href="../mod/core.html#directory">Directory</a></code>,  
+    and <code class="directive"><a href="../mod/core.html#files">Files</a></code> sections.</p>
+    <p>The <code class="directive"><a href="#authmerging">AuthMerging</a></code> directive 
+    can be used to control how authorization configuration sections are 
+    merged.</p>
+    </div>
+
 <h3>See also</h3>
 <ul>
 <li><a href="../howto/auth.html">Authentication, Authorization,
diff --git a/docs/manual/mod/mod_authz_core.xml b/docs/manual/mod/mod_authz_core.xml
index 70c71a0ac5..d33a2197b1 100644
--- a/docs/manual/mod/mod_authz_core.xml
+++ b/docs/manual/mod/mod_authz_core.xml
@@ -355,6 +355,19 @@ Require group admin
     directive.  Thus the first one to authorize a user authorizes the
     entire request, and subsequent <directive>Require</directive> directives
     are ignored.</p>
+
+    <note type="warning"><title>Security Warning</title>
+    <p>Exercise caution when setting authorization directives in
+    <directive module="core">Location</directive> sections
+    that overlap with content served out of the filesystem.  
+    By default, these <a href="../sections.html#mergin"
+    >configuration sections</a> overwrite authorization configuration
+    in <directive module="core">Directory</directive>,  
+    and <directive module="core">Files</directive> sections.</p>
+    <p>The <directive module="mod_authz_core">AuthMerging</directive> directive 
+    can be used to control how authorization configuration sections are 
+    merged.</p>
+    </note>
 </usage>
 
 <seealso><a href="../howto/auth.html">Authentication, Authorization,
-- 
2.50.1