From eaa82b226c43fc05031abbc7e6bb8253e99dc615 Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Tue, 15 Nov 2011 23:00:46 +0000 Subject: [PATCH] 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 --- docs/manual/expr.html.en | 2 +- docs/manual/expr.xml | 2 ++ docs/manual/mod/mod_authnz_ldap.html.en | 3 +++ docs/manual/mod/mod_authnz_ldap.xml | 3 +++ docs/manual/mod/mod_ldap.html.en | 1 + docs/manual/mod/mod_ldap.xml | 1 + docs/manual/new_features_2_4.html.en | 20 ++++++++++++++++++++ docs/manual/new_features_2_4.xml | 20 ++++++++++++++++++++ 8 files changed, 51 insertions(+), 1 deletion(-) diff --git a/docs/manual/expr.html.en b/docs/manual/expr.html.en index fd89aef6a8..6e541d4c20 100644 --- a/docs/manual/expr.html.en +++ b/docs/manual/expr.html.en @@ -41,7 +41,7 @@
  • Functions
  • Other
  • Comparison with SSLRequire
    • -

    See also

    +

    See also

    top

    Grammar in Backus–Naur Form notation

    diff --git a/docs/manual/expr.xml b/docs/manual/expr.xml index 7726736f8d..97fd517df1 100644 --- a/docs/manual/expr.xml +++ b/docs/manual/expr.xml @@ -43,6 +43,8 @@ Else RewriteCond SetEnvIfExpr +Header +RequestHeader FilterProvider Require expr SSLRequire diff --git a/docs/manual/mod/mod_authnz_ldap.html.en b/docs/manual/mod/mod_authnz_ldap.html.en index 29642e4b36..889c704113 100644 --- 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. Override:AuthConfig Status:Extension Module:mod_authnz_ldap +Compatibility:Available in version 2.3.0 and later

    When this directive is set to a non-zero value X combined with use of the Require ldap-group someGroupDN @@ -1186,6 +1187,7 @@ are groups. Override:AuthConfig Status:Extension Module:mod_authnz_ldap +Compatibility:Available in version 2.3.0 and later

    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. Override:AuthConfig Status:Extension Module:mod_authnz_ldap +Compatibility:Available in version 2.3.0 and later

    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 a07ad31830..dad7d846c9 100644 --- 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. directory.htaccess AuthConfig +Available in version 2.3.0 and later

    When this directive is set to a non-zero value X @@ -1161,6 +1162,7 @@ are groups. directory.htaccess AuthConfig +Available in version 2.3.0 and later

    An LDAP group object may contain members that are users and @@ -1183,6 +1185,7 @@ objects that are groups during sub-group processing. directory.htaccess AuthConfig +Available in version 2.3.0 and later

    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 9c104cf85e..090e198d6a 100644 --- a/docs/manual/mod/mod_ldap.html.en +++ b/docs/manual/mod/mod_ldap.html.en @@ -661,6 +661,7 @@ valid Context:server config Status:Extension Module:mod_ldap +Compatibility:Apache HTTP Server 2.3.5 and later

    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.

    diff --git a/docs/manual/mod/mod_ldap.xml b/docs/manual/mod/mod_ldap.xml index 7d850fb4c3..37f7e56ef0 100644 --- a/docs/manual/mod/mod_ldap.xml +++ b/docs/manual/mod/mod_ldap.xml @@ -665,6 +665,7 @@ connection client certificates. LDAPTimeout seconds LDAPTimeout 60 server config +Apache HTTP Server 2.3.5 and later

    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 ca29e4259f..d7c078654a 100644 --- 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 [END] flags for RewriteRule to simplify common rewriting scenarios. + +

    mod_ldap, mod_authnz_ldap
    +
    mod_authnz_ldap adds support for nested groups.
    +
    mod_ldap adds + LDAPConnectionPoolTTL, + LDAPTimeout, 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.
    +
    mod_ldap adds + LDAPLibraryDebug to log + debug information provided by the used LDAP toolkit.
    +
    top
    @@ -262,6 +275,13 @@ expression parser previously implemented in mod_ssl. +
    The expression parser allows to specify + complex conditions in directives like + SetEnvIfExpr, + RewriteCond, and + Header. +
    +
    Authorization Logic Containers
    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 ac5d6aa22c..f51981d710 100644 --- a/docs/manual/new_features_2_4.xml +++ b/docs/manual/new_features_2_4.xml @@ -216,6 +216,19 @@ (Query String Discard) and [END] flags for RewriteRule to simplify common rewriting scenarios.
    + +
    mod_ldap, mod_authnz_ldap
    +
    mod_authnz_ldap adds support for nested groups.
    +
    mod_ldap adds + LDAPConnectionPoolTTL, + LDAPTimeout, 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.
    +
    mod_ldap adds + LDAPLibraryDebug to log + debug information provided by the used LDAP toolkit.
    + @@ -260,6 +273,13 @@ expression parser previously implemented in mod_ssl. +
    The expression parser allows to specify + complex conditions in directives like + SetEnvIfExpr, + RewriteCond, and + Header. +
    +
    Authorization Logic Containers
    Authorization modules now register as a provider, via -- 2.40.0