Commit 21c39bdb authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

add new ldap features, make ap_expr entry more verbose 


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

docs/manual/expr.html.en

+1 −1
Changes for docs/manual/expr.html.en: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
<li><img alt="" src="./images/down.gif" /> <a href="#functions">Functions</a></li>

<li><img alt="" src="./images/down.gif" /> <a href="#other">Other</a></li>

<li><img alt="" src="./images/down.gif" /> <a href="#sslrequire">Comparison with SSLRequire</a></li>

</ul><h3>See also</h3><ul class="seealso"><li><code class="directive"><a href="./mod/core.html#if">&lt;If&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#elseif">&lt;ElseIf&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#else">&lt;Else&gt;</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#setenvifexpr">SetEnvIfExpr</a></code></li><li><code class="directive"><a href="./mod/mod_filter.html#filterprovider">FilterProvider</a></code></li><li><a href="mod/mod_authz_core.html#reqexpr">Require expr</a></li><li><code class="directive"><a href="./mod/mod_ssl.html#sslrequire">SSLRequire</a></code></li><li><code class="directive"><a href="./mod/mod_log_debug.html#logmessage">LogMessage</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li></ul></div>

</ul><h3>See also</h3><ul class="seealso"><li><code class="directive"><a href="./mod/core.html#if">&lt;If&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#elseif">&lt;ElseIf&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#else">&lt;Else&gt;</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#setenvifexpr">SetEnvIfExpr</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#requestheader">RequestHeader</a></code></li><li><code class="directive"><a href="./mod/mod_filter.html#filterprovider">FilterProvider</a></code></li><li><a href="mod/mod_authz_core.html#reqexpr">Require expr</a></li><li><code class="directive"><a href="./mod/mod_ssl.html#sslrequire">SSLRequire</a></code></li><li><code class="directive"><a href="./mod/mod_log_debug.html#logmessage">LogMessage</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li></ul></div>

<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>

<div class="section">

<h2><a name="grammar" id="grammar">Grammar in Backus&#8211;Naur Form notation</a></h2>

docs/manual/expr.xml

+2 −0
Changes for docs/manual/expr.xml: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ 
<seealso><directive module="core" type="section">Else</directive></seealso>

<seealso><directive module="mod_rewrite">RewriteCond</directive></seealso>

<seealso><directive module="mod_setenvif">SetEnvIfExpr</directive></seealso>

<seealso><directive module="mod_headers">Header</directive></seealso>

<seealso><directive module="mod_headers">RequestHeader</directive></seealso>

<seealso><directive module="mod_filter">FilterProvider</directive></seealso>

<seealso><a href="mod/mod_authz_core.html#reqexpr">Require expr</a></seealso>

<seealso><directive module="mod_ssl">SSLRequire</directive></seealso>

docs/manual/mod/mod_authnz_ldap.html.en

+3 −0
Changes for docs/manual/mod/mod_authnz_ldap.html.en: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1086,6 +1086,7 @@ evaluated before the user search is discontinued.</td></tr> 
<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</td></tr>

<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>

<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_authnz_ldap</td></tr>

<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.0 and later</td></tr>

</table>

   <p>When this directive is set to a non-zero value <code>X</code>

   combined with use of the <code>Require ldap-group someGroupDN</code>
@@ -1186,6 +1187,7 @@ are groups.</td></tr> 
<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</td></tr>

<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>

<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_authnz_ldap</td></tr>

<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.0 and later</td></tr>

</table>

    <p>An LDAP group object may contain members that are users and

    members that are groups (called nested or sub groups). The
@@ -1208,6 +1210,7 @@ objects that are groups during sub-group processing.</td></tr> 
<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</td></tr>

<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>

<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_authnz_ldap</td></tr>

<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.0 and later</td></tr>

</table>

    <p>An LDAP group object may contain members that are users and

    members that are groups (called nested or sub groups). The

docs/manual/mod/mod_authnz_ldap.xml

+3 −0
Changes for docs/manual/mod/mod_authnz_ldap.xml: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1064,6 +1064,7 @@ evaluated before the user search is discontinued.</description> 
<contextlist><context>directory</context><context>.htaccess</context>

</contextlist>

<override>AuthConfig</override>

<compatibility>Available in version 2.3.0 and later</compatibility>



<usage>

   <p>When this directive is set to a non-zero value <code>X</code>
@@ -1161,6 +1162,7 @@ are groups.</description> 
<contextlist><context>directory</context><context>.htaccess</context>

</contextlist>

<override>AuthConfig</override>

<compatibility>Available in version 2.3.0 and later</compatibility>



<usage>

    <p>An LDAP group object may contain members that are users and
@@ -1183,6 +1185,7 @@ objects that are groups during sub-group processing.</description> 
<contextlist><context>directory</context><context>.htaccess</context>

</contextlist>

<override>AuthConfig</override>

<compatibility>Available in version 2.3.0 and later</compatibility>



<usage>

    <p>An LDAP group object may contain members that are users and

docs/manual/mod/mod_ldap.html.en

+1 −0
Changes for docs/manual/mod/mod_ldap.html.en: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -661,6 +661,7 @@ valid</td></tr> 
<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>

<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>

<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ldap</td></tr>

<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Apache HTTP Server 2.3.5 and later</td></tr>

</table>

    <p>This directive configures the timeout for bind and search operations, as well as

    the LDAP_OPT_TIMEOUT option in the underlying LDAP client library, when available.</p>