www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Accept LDAP_OPT_CONNECT_TIMEOUT as an alternative to LDAP_OPT_NETWORK_TIMEOUT.

Browse Source 
An alternative on at least some IBM client libraries:

  http://publib.boulder.ibm.com/infocenter/tivihelp/v2r1/topic/com.ibm.IBMDS.doc/progref281.htm#opttimeout



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1157111 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eric Covener
2011-08-12 13:56:54 +00:00
parent 4e858e3859
commit a68a8e4918
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -1,6 +1,10 @@
-*- coding: utf-8 -*- -*- coding: utf-8 -*-
Changes with Apache 2.3.15 Changes with Apache 2.3.15
*) mod_ldap: Enable LDAPConnectionTimeout for LDAP toolkits that have
LDAP_OPT_CONNECT_TIMEOUT instead of LDAP_OPT_NETWORK_TIMEOUT, such
as Tivoli Directory Server 6.3 and later. [Eric Covener]
*) mod_ldap: Change default number of retries from 10 to 3, and add *) mod_ldap: Change default number of retries from 10 to 3, and add
an LDAPRetries and LDAPRetryDelay directives. [Eric Covener] an LDAPRetries and LDAPRetryDelay directives. [Eric Covener]

13
docs/manual/mod/mod_ldap.xml
View File

@@ -638,10 +638,10 @@ connection client certificates.</description>
<contextlist><context>server config</context></contextlist> <contextlist><context>server config</context></contextlist>
<usage> <usage>
<p>This directive configures the LDAP_OPT_NETWORK_TIMEOUT option in the <p>This directive configures the LDAP_OPT_NETWORK_TIMEOUT (or LDAP_OPT_CONNECT_TIMEOUT)
underlying LDAP client library, when available. This value typically option in the underlying LDAP client library, when available. This value
controls how long the LDAP client library will wait for the TCP connection typically controls how long the LDAP client library will wait for the TCP
to the LDAP server to complete.</p> connection to the LDAP server to complete.</p>
<p> If a connection is not successful with the timeout period, either an error will be <p> 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 returned or the LDAP client library will attempt to connect to a secondary LDAP
@@ -652,8 +652,9 @@ connection client certificates.</description>
server supports the LDAP_OPT_NETWORK_TIMEOUT option.</p> server supports the LDAP_OPT_NETWORK_TIMEOUT option.</p>
<note>LDAPConnectionTimeout is only available when the LDAP client library linked <note>LDAPConnectionTimeout is only available when the LDAP client library linked
with the server supports the LDAP_OPT_NETWORK_TIMEOUT option, and the with the server supports the LDAP_OPT_NETWORK_TIMEOUT
ultimate behavior is dictated entirely by the LDAP client library. (or LDAP_OPT_CONNECT_TIMEOUT) option, and the ultimate behavior is
dictated entirely by the LDAP client library.
</note> </note>
</usage> </usage>
</directivesynopsis> </directivesynopsis>

4
modules/ldap/util_ldap.c
View File

@@ -66,6 +66,10 @@
#define AP_LDAP_CONNPOOL_DEFAULT -1 #define AP_LDAP_CONNPOOL_DEFAULT -1
#define AP_LDAP_CONNPOOL_INFINITE -2 #define AP_LDAP_CONNPOOL_INFINITE -2
#if !defined(LDAP_OPT_NETWORK_TIMEOUT) && defined(LDAP_OPT_CONNECT_TIMEOUT)
#define LDAP_OPT_NETWORK_TIMEOUT LDAP_OPT_CONNECT_TIMEOUT
#endif
module AP_MODULE_DECLARE_DATA ldap_module; module AP_MODULE_DECLARE_DATA ldap_module;
static const char *ldap_cache_mutex_type = "ldap-cache"; static const char *ldap_cache_mutex_type = "ldap-cache";
static apr_status_t uldap_connection_unbind(void *param); static apr_status_t uldap_connection_unbind(void *param);