From: Eric Covener Date: Sat, 23 Jan 2010 17:15:04 +0000 (+0000) Subject: fix LDAPConnectionTimeout, take a stab at newly added LDAPTimeout X-Git-Tag: 2.3.6~559 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d7922d578c1c89d0e1799addd607478a38e2b75;p=apache fix LDAPConnectionTimeout, take a stab at newly added LDAPTimeout git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@902445 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_ldap.html.en b/docs/manual/mod/mod_ldap.html.en index e5acfa60ef..2907e3dbee 100644 --- a/docs/manual/mod/mod_ldap.html.en +++ b/docs/manual/mod/mod_ldap.html.en @@ -67,6 +67,7 @@ by other LDAP modules
  • LDAPReferrals
  • LDAPSharedCacheFile
  • LDAPSharedCacheSize
    • +
  • LDAPTimeout
  • LDAPTrustedClientCert
  • LDAPTrustedGlobalCert
  • LDAPTrustedMode
    • @@ -474,9 +475,8 @@ by other LDAP modules

    This directive configures the LDAP_OPT_NETWORK_TIMEOUT option in the underlying LDAP client library, when available. This value typically - controls how long the LDAP client library will wait for various network - calls to complete, including establishing a connection to the target LDAP - server.

    + controls how long the LDAP client library will wait for the TCP connection + to the LDAP server to complete.

    If a connection is not successful with the timeout period, either an error will be returned or the LDAP client library will attempt to connect to a secondary LDAP @@ -619,6 +619,28 @@ valid memory cache. The default is 500kb. If set to 0, shared memory caching will not be used.

    + +
    top
    +

    LDAPTimeout Directive

    + + + + + + + +
    Description:Specifies the timeout for LDAP search and bind operations, in seconds
    Syntax:LDAPTimeout seconds
    Default:LDAPTimeout 60
    Context:server config
    Status:Extension
    Module:mod_ldap
    +

    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.

    + +

    If the timeout expires, httpd will retry in case an existing connection has + been silently dropped by a firewall.

    + +
    +

    Timeouts for ldap compare operations requires an SDK with LDAP_OPT_TIMEOUT, such as OpenLDAP >= 2.4.4.

    +
    + +
    top

    LDAPTrustedClientCert Directive

    diff --git a/docs/manual/mod/mod_ldap.xml b/docs/manual/mod/mod_ldap.xml index 0bef2b366b..177dab95cb 100644 --- a/docs/manual/mod/mod_ldap.xml +++ b/docs/manual/mod/mod_ldap.xml @@ -633,9 +633,8 @@ connection client certificates.

    This directive configures the LDAP_OPT_NETWORK_TIMEOUT option in the underlying LDAP client library, when available. This value typically - controls how long the LDAP client library will wait for various network - calls to complete, including establishing a connection to the target LDAP - server.

    + controls how long the LDAP client library will wait for the TCP connection + to the LDAP server to complete.

    If a connection is not successful with the timeout period, either an error will be returned or the LDAP client library will attempt to connect to a secondary LDAP @@ -652,6 +651,28 @@ connection client certificates. + +LDAPTimeout +Specifies the timeout for LDAP search and bind operations, in seconds +LDAPTimeout seconds +LDAPTimeout 60 +server config + + +

    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.

    + +

    If the timeout expires, httpd will retry in case an existing connection has + been silently dropped by a firewall.

    + + +

    Timeouts for ldap compare operations requires an SDK with LDAP_OPT_TIMEOUT, such as OpenLDAP >= 2.4.4.

    +     + +     + + + LDAPVerifyServerCert Force server certificate verification