Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1496176 - in /httpd/httpd/trunk: CHANGES
 modules/ldap/util_ldap.c
Date: Mon, 24 Jun 2013 19:40:24 -0000
To: cvs@httpd.apache.org
From: covener@apache.org
Message-Id: <20130624194024.CDF9C2388900@eris.apache.org>

Author: covener
Date: Mon Jun 24 19:40:24 2013
New Revision: 1496176

URL: http://svn.apache.org/r1496176
Log:
prevent excessive delays retrying new connections that timed out.


Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/ldap/util_ldap.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1496176&r1=1496175&r2=1496176&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Jun 24 19:40:24 2013
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_ldap: Don't keep retrying if a new LDAP connection times out.
+     [Eric Covener]
+
   *) mod_deflate: permit compilation of mod_deflate against a zlib that has
      been configured with -D Z_PREFIX, which redefines the token "deflate".
      [Eric Covener]

Modified: httpd/httpd/trunk/modules/ldap/util_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/util_ldap.c?rev=1496176&r1=1496175&r2=1496176&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap.c Mon Jun 24 19:40:24 2013
@@ -602,6 +602,7 @@ static int uldap_connection_open(request
                           "ldap_simple_bind() timed out on %s "
                           "connection, dropped by firewall?",
                           new_connection ? "new" : "reused");
+            if (new_connection) break;
         }
         else {
             /* Other errors not retryable */