Merge r1202456:

add new ldap features, make ap_expr entry more verbose

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

diff --git a/docs/manual/expr.html.en b/docs/manual/expr.html.en
index fd89aef6a8de025b3cc45837da892c971ad1e5bc..6e541d4c20f72d2098dab29bb3f93a17ab53248a 100644 (file)
--- a/docs/manual/expr.html.en
+++ b/docs/manual/expr.html.en
@@ -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>

diff --git a/docs/manual/expr.xml b/docs/manual/expr.xml
index 7726736f8dae65accfe3aaee92405342a4485f65..97fd517df1ca326c47a703487a48cadd6607a565 100644 (file)
--- a/docs/manual/expr.xml
+++ b/docs/manual/expr.xml
@@ -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>

diff --git a/docs/manual/mod/mod_authnz_ldap.html.en b/docs/manual/mod/mod_authnz_ldap.html.en
index 29642e4b3645ff8b47e2d4d1d59292bc4dfe350c..889c70411319146374b56d2a4de55775ade4014a 100644 (file)
--- a/docs/manual/mod/mod_authnz_ldap.html.en
+++ b/docs/manual/mod/mod_authnz_ldap.html.en
@@ -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

diff --git a/docs/manual/mod/mod_authnz_ldap.xml b/docs/manual/mod/mod_authnz_ldap.xml
index a07ad31830579af0579777ef89732366d66e3224..dad7d846c9556907512c2a9b134bf938d972f1e5 100644 (file)
--- a/docs/manual/mod/mod_authnz_ldap.xml
+++ b/docs/manual/mod/mod_authnz_ldap.xml
@@ -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

diff --git a/docs/manual/mod/mod_ldap.html.en b/docs/manual/mod/mod_ldap.html.en
index 9c104cf85eb310dccf51bd895b43ead0bd7ecdda..090e198d6adae4d8d9b626da77be0ab0ad0943c2 100644 (file)
--- a/docs/manual/mod/mod_ldap.html.en
+++ b/docs/manual/mod/mod_ldap.html.en
@@ -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>

diff --git a/docs/manual/mod/mod_ldap.xml b/docs/manual/mod/mod_ldap.xml
index 7d850fb4c3c3d4169da4750743765caebe4cf231..37f7e56ef0bbeccf3dbea93d93c4341cfdbba4b9 100644 (file)
--- a/docs/manual/mod/mod_ldap.xml
+++ b/docs/manual/mod/mod_ldap.xml
@@ -665,6 +665,7 @@ connection client certificates.</description>
 <syntax>LDAPTimeout <var>seconds</var></syntax>
 <default>LDAPTimeout 60</default>
 <contextlist><context>server config</context></contextlist>
+<compatibility>Apache HTTP Server 2.3.5 and later</compatibility>
 
 <usage>
     <p>This directive configures the timeout for bind and search operations, as well as

diff --git a/docs/manual/new_features_2_4.html.en b/docs/manual/new_features_2_4.html.en
index ca29e4259f39eee4d1fbd1a743b8b12dc36ac50c..d7c078654aa17ef076e44985be8d2224ea8e6a63 100644 (file)
--- a/docs/manual/new_features_2_4.html.en
+++ b/docs/manual/new_features_2_4.html.en
@@ -218,6 +218,19 @@
       (Query String Discard) and <code>[END]</code> flags for
       <code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> to
       simplify common rewriting scenarios.</dd>
+
+      <dt><code class="module"><a href="./mod/mod_ldap.html">mod_ldap</a></code>, <code class="module"><a href="./mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code></dt>
+      <dd><code class="module"><a href="./mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> adds support for nested groups.</dd>
+      <dd><code class="module"><a href="./mod/mod_ldap.html">mod_ldap</a></code> adds
+          <code class="directive"><a href="./mod/mod_ldap.html#ldapconnectionpoolttl">LDAPConnectionPoolTTL</a></code>,
+          <code class="directive"><a href="./mod/mod_ldap.html#ldaptimeout">LDAPTimeout</a></code>, and
+          other improvements in the handling of timeouts.
+          This is especially useful for setups where a
+          stateful firewall drops idle connections to the LDAP server.</dd>
+      <dd><code class="module"><a href="./mod/mod_ldap.html">mod_ldap</a></code> adds
+          <code class="directive"><a href="./mod/mod_ldap.html#ldaplibrarydebug">LDAPLibraryDebug</a></code> to log
+          debug information provided by the used LDAP toolkit.</dd>
+
     </dl>
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
@@ -262,6 +275,13 @@
           expression parser previously implemented in
           <code class="module"><a href="./mod/mod_ssl.html">mod_ssl</a></code>.</dd>
 
+      <dd>The expression parser allows to specify
+          <a href="expr.html">complex conditions</a> in directives like
+          <code class="directive"><a href="./mod/mod_setenvif.html#setenvifexpr">SetEnvIfExpr</a></code>,
+          <code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code>, and
+          <code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code>.
+      </dd>
+
       <dt>Authorization Logic Containers</dt>
 
       <dd>Authorization modules now register as a provider, via

diff --git a/docs/manual/new_features_2_4.xml b/docs/manual/new_features_2_4.xml
index ac5d6aa22ccc212c1af1a49151d09f37dd92e5ee..f51981d71091739c1c796602ddd30c8574e580a3 100644 (file)
--- a/docs/manual/new_features_2_4.xml
+++ b/docs/manual/new_features_2_4.xml
@@ -216,6 +216,19 @@
       (Query String Discard) and <code>[END]</code> flags for
       <directive module="mod_rewrite">RewriteRule</directive> to
       simplify common rewriting scenarios.</dd>
+
+      <dt><module>mod_ldap</module>, <module>mod_authnz_ldap</module></dt>
+      <dd><module>mod_authnz_ldap</module> adds support for nested groups.</dd>
+      <dd><module>mod_ldap</module> adds
+          <directive module="mod_ldap">LDAPConnectionPoolTTL</directive>,
+          <directive module="mod_ldap">LDAPTimeout</directive>, and
+          other improvements in the handling of timeouts.
+          This is especially useful for setups where a
+          stateful firewall drops idle connections to the LDAP server.</dd>
+      <dd><module>mod_ldap</module> adds
+          <directive module="mod_ldap">LDAPLibraryDebug</directive> to log
+          debug information provided by the used LDAP toolkit.</dd>
+
     </dl>
   </section>
 
@@ -260,6 +273,13 @@
           expression parser previously implemented in
           <module>mod_ssl</module>.</dd>
 
+      <dd>The expression parser allows to specify
+          <a href="expr.html">complex conditions</a> in directives like
+          <directive module="mod_setenvif">SetEnvIfExpr</directive>,
+          <directive module="mod_rewrite">RewriteCond</directive>, and
+          <directive module="mod_headers">Header</directive>.
+      </dd>
+
       <dt>Authorization Logic Containers</dt>
 
       <dd>Authorization modules now register as a provider, via