Return-Path: 
 <cvs-return-34641-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: (qmail 10930 invoked from network); 7 Jan 2010 18:47:33 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 7 Jan 2010 18:47:33 -0000
Received: (qmail 14718 invoked by uid 500); 7 Jan 2010 18:47:33 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 14646 invoked by uid 500); 7 Jan 2010 18:47:33 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 14637 invoked by uid 99); 7 Jan 2010 18:47:33 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jan 2010 18:47:33 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jan 2010 18:47:32 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 4F120238899B; Thu,  7 Jan 2010 18:47:12 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r896956 - in /httpd/httpd/branches/2.2.x/docs/manual/mod:
 mod_ldap.html.en mod_ldap.xml
Date: Thu, 07 Jan 2010 18:47:12 -0000
To: cvs@httpd.apache.org
From: covener@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100107184712.4F120238899B@eris.apache.org>

Author: covener
Date: Thu Jan  7 18:47:11 2010
New Revision: 896956

URL: http://svn.apache.org/viewvc?rev=896956&view=rev
Log:
Merge r896897 from trunk:

clarify LDAPConnectionTimeout behavior/availability which is really just 
passed along to the SDK when applicable.



Modified:
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ldap.html.en
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ldap.xml

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ldap.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ldap.html.en?rev=896956&r1=896955&r2=896956&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ldap.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ldap.html.en Thu Jan  7 18:47:11 2010
@@ -441,11 +441,24 @@
 <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>Specifies the timeout value (in seconds) in which the module will
-    attempt to connect to the LDAP server.  If a connection is not
-    successful with the timeout period, either an error will be 
-    returned or the module will attempt to connect to a secondary LDAP 
-    server if one is specified. The default is 10 seconds.</p>
+    <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>
+
+    <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 
+    server if one is specified (via a space-separated list of hostnames in the 
+    <code class="directive"><a href="#authldapurl">AuthLDAPURL</a></code>).</p>
+
+    <p>The default is 10 seconds, if the LDAP client library linked with the 
+    server supports the LDAP_OPT_NETWORK_TIMEOUT option.</p>
+
+    <div class="note">LDAPConnectionTimeout is only available when the LDAP client library linked
+    with the server supports the LDAP_OPT_NETWORK_TIMEOUT option, and the
+    ultimate behavior is dictated entirely by the LDAP client library.
+    </div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ldap.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ldap.xml?rev=896956&r1=896955&r2=896956&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ldap.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ldap.xml Thu Jan  7 18:47:11 2010
@@ -566,11 +566,24 @@
 <contextlist><context>server config</context></contextlist>
 
 <usage>
-    <p>Specifies the timeout value (in seconds) in which the module will
-    attempt to connect to the LDAP server.  If a connection is not
-    successful with the timeout period, either an error will be 
-    returned or the module will attempt to connect to a secondary LDAP 
-    server if one is specified. The default is 10 seconds.</p>
+    <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>
+
+    <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 
+    server if one is specified (via a space-separated list of hostnames in the 
+    <directive module="mod_ldap">AuthLDAPURL</directive>).</p>
+
+    <p>The default is 10 seconds, if the LDAP client library linked with the 
+    server supports the LDAP_OPT_NETWORK_TIMEOUT option.</p>
+
+    <note>LDAPConnectionTimeout is only available when the LDAP client library linked
+    with the server supports the LDAP_OPT_NETWORK_TIMEOUT option, and the
+    ultimate behavior is dictated entirely by the LDAP client library.
+    </note>
 </usage>
 </directivesynopsis>