From: Vincent Deffontaines <gryzor@apache.org>
Date: Thu, 18 Sep 2014 19:38:24 +0000 (+0000)
Subject: [doc][2.2] Provide a note related to use of multiple Require directives on some setups
X-Git-Tag: 2.2.30~222
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f22506e3489969b08eabe9b428d9c13b3ca84fcd;p=thirdparty%2Fapache%2Fhttpd.git

[doc][2.2] Provide a note related to use of multiple Require directives on some setups

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1626056 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 664fa166b0d..59fcf2f2a8d 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -516,7 +516,7 @@ NoDecode option available in 2.2.18 and later.</td></tr>
       separated lists of options that may be set using the <code class="directive"><a href="#options">Options</a></code> command.
 
       <div class="note"><h3>Implicit disabling of Options</h3>
-      <p>Even though the list of options that may be used in .htaccess files 
+      <p>Even though the list of options that may be used in .htaccess files
          can be limited with this directive, as long as any <code class="directive"><a href="#options">Options</a></code> directive is allowed any
          other inherited option can be disabled by using the non-relative
          syntax.  In other words, this mechanism cannot force a specific option
@@ -2349,13 +2349,13 @@ resource </td></tr>
     return to the client. If more ranges than permitted are requested,
     the complete resource is returned instead.</p>
 
-    <dl>  
+    <dl>
       <dt><strong>default</strong></dt>
       <dd>Limits the number of ranges to a compile-time default of 200.</dd>
-   
+
       <dt><strong>none</strong></dt>
       <dd>Range headers are ignored.</dd>
-          
+
       <dt><strong>unlimited</strong></dt>
       <dd>The server does not limit the number of ranges it is
           willing to satisfy.</dd>
@@ -2750,6 +2750,14 @@ a resource</td></tr>
       &lt;/Directory&gt;<br />
     </code></p></div>
     </div>
+    <div class="note"><h3>Combined use of authentication backends</h3>
+    <p>Multiple <code class="directive">Require</code> directives do operate as
+    logical "OR", but some underlying authentication modules may require
+    an explicit configuration to let authentication be chained to others.
+    This is typically the case with <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code>,
+    which exports the <code class="directive">AuthzLDAPAuthoritative</code> in
+    that intent.</p>
+    </div>
 
 
 <h3>See also</h3>
@@ -3050,7 +3058,7 @@ to name-virtual hosts</td></tr>
     (nor for ServerName vs. ServerAlias).  </p>
 
     <p>The complete list of names in the <code class="directive">VirtualHost</code>
-    directive are treated just like a (non wildcard) 
+    directive are treated just like a (non wildcard)
     <code class="directive">ServerAlias</code>.</p>
 
 
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 69c8b8a1631..f4f01f277ef 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -440,7 +440,7 @@ NoDecode option available in 2.2.18 and later.</compatibility>
       module="mod_autoindex">AddIconByEncoding</directive>,
       <directive module="mod_autoindex">AddIconByType</directive>,
       <directive module="mod_autoindex">DefaultIcon</directive>, <directive
-      module="mod_dir">DirectoryIndex</directive>, <a 
+      module="mod_dir">DirectoryIndex</directive>, <a
 	  href="mod_autoindex.html#indexoptions.fancyindexing"><code>FancyIndexing</code>
 	  </a>, <directive
       module="mod_autoindex">HeaderName</directive>, <directive
@@ -468,8 +468,8 @@ NoDecode option available in 2.2.18 and later.</compatibility>
       module="core">Options</directive> command.
 
       <note><title>Implicit disabling of Options</title>
-      <p>Even though the list of options that may be used in .htaccess files 
-         can be limited with this directive, as long as any <directive 
+      <p>Even though the list of options that may be used in .htaccess files
+         can be limited with this directive, as long as any <directive
          module="core">Options</directive> directive is allowed any
          other inherited option can be disabled by using the non-relative
          syntax.  In other words, this mechanism cannot force a specific option
@@ -2332,13 +2332,13 @@ resource </description>
     return to the client. If more ranges than permitted are requested,
     the complete resource is returned instead.</p>
 
-    <dl>  
+    <dl>
       <dt><strong>default</strong></dt>
       <dd>Limits the number of ranges to a compile-time default of 200.</dd>
-   
+
       <dt><strong>none</strong></dt>
       <dd>Range headers are ignored.</dd>
-          
+
       <dt><strong>unlimited</strong></dt>
       <dd>The server does not limit the number of ranges it is
           willing to satisfy.</dd>
@@ -2693,6 +2693,14 @@ a resource</description>
       &lt;/Directory&gt;<br />
     </example>
     </note>
+    <note><title>Combined use of authentication backends</title>
+    <p>Multiple <directive>Require</directive> directives do operate as
+    logical "OR", but some underlying authentication modules may require
+    an explicit configuration to let authentication be chained to others.
+    This is typically the case with <module>mod_authnz_ldap</module>,
+    which exports the <directive>AuthzLDAPAuthoritative</directive> in
+    that intent.</p>
+    </note>
 
 </usage>
 
@@ -3018,7 +3026,7 @@ to name-virtual hosts</description>
     (nor for ServerName vs. ServerAlias).  </p>
 
     <p>The complete list of names in the <directive>VirtualHost</directive>
-    directive are treated just like a (non wildcard) 
+    directive are treated just like a (non wildcard)
     <directive>ServerAlias</directive>.</p>
 
 </usage>