httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
Subject svn commit: r902445 - in /httpd/httpd/trunk/docs/manual/mod: mod_ldap.html.en mod_ldap.xml
Date Sat, 23 Jan 2010 17:15:05 GMT
Author: covener
Date: Sat Jan 23 17:15:04 2010
New Revision: 902445

URL: http://svn.apache.org/viewvc?rev=902445&view=rev
Log:
fix LDAPConnectionTimeout, take a stab at newly added LDAPTimeout

Modified:
    httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_ldap.xml

Modified: httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en?rev=902445&r1=902444&r2=902445&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en Sat Jan 23 17:15:04 2010
@@ -67,6 +67,7 @@
 <li><img alt="" src="../images/down.gif" /> <a href="#ldapreferrals">LDAPReferrals</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#ldapsharedcachefile">LDAPSharedCacheFile</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#ldapsharedcachesize">LDAPSharedCacheSize</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ldaptimeout">LDAPTimeout</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#ldaptrustedclientcert">LDAPTrustedClientCert</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#ldaptrustedglobalcert">LDAPTrustedGlobalCert</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#ldaptrustedmode">LDAPTrustedMode</a></li>
@@ -474,9 +475,8 @@
 </table>
     <p>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.</p>
+    controls how long the LDAP client library will wait for the TCP connection
+    to the LDAP server to complete.</p>
 
     <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 
@@ -621,6 +621,28 @@
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
+<div class="directive-section"><h2><a name="LDAPTimeout" id="LDAPTimeout">LDAPTimeout</a>
<a name="ldaptimeout" id="ldaptimeout">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specifies
the timeout for LDAP search and bind operations, in seconds</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LDAPTimeout
<var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LDAPTimeout
60</code></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>
+</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>
+
+    <p> If the timeout expires, httpd will retry in case an existing connection has
+    been silently dropped by a firewall.</p>
+
+    <div class="note">
+    <p>Timeouts for ldap compare operations requires an SDK with LDAP_OPT_TIMEOUT,
such as OpenLDAP &gt;= 2.4.4.</p>
+    </div>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
 <div class="directive-section"><h2><a name="LDAPTrustedClientCert" id="LDAPTrustedClientCert">LDAPTrustedClientCert</a>
<a name="ldaptrustedclientcert" id="ldaptrustedclientcert">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets
the file containing or nickname referring to a per

Modified: httpd/httpd/trunk/docs/manual/mod/mod_ldap.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ldap.xml?rev=902445&r1=902444&r2=902445&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ldap.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ldap.xml Sat Jan 23 17:15:04 2010
@@ -633,9 +633,8 @@
 <usage>
     <p>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.</p>
+    controls how long the LDAP client library will wait for the TCP connection
+    to the LDAP server to complete.</p>
 
     <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 
@@ -653,6 +652,28 @@
 </directivesynopsis>
 
 <directivesynopsis>
+<name>LDAPTimeout</name>
+<description>Specifies the timeout for LDAP search and bind operations, in seconds</description>
+<syntax>LDAPTimeout <var>seconds</var></syntax>
+<default>LDAPTimeout 60</default>
+<contextlist><context>server config</context></contextlist>
+
+<usage>
+    <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>
+
+    <p> If the timeout expires, httpd will retry in case an existing connection has
+    been silently dropped by a firewall.</p>
+
+    <note>
+    <p>Timeouts for ldap compare operations requires an SDK with LDAP_OPT_TIMEOUT,
such as OpenLDAP &gt;= 2.4.4.</p>
+    </note>
+
+</usage>
+</directivesynopsis>
+
+
+<directivesynopsis>
 <name>LDAPVerifyServerCert</name>
 <description>Force server certificate verification</description>
 <syntax>LDAPVerifyServerCert <var>On|Off</var></syntax>



Mime
View raw message