From: Eric Covener <covener@apache.org>
Date: Mon, 24 Jun 2013 19:40:24 +0000 (+0000)
Subject: prevent excessive delays retrying new connections that timed out.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adee7d321116b5d4b090dc24c9a5e782a78a3bd7;p=thirdparty%2Fapache%2Fhttpd.git

prevent excessive delays retrying new connections that timed out.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1496176 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 1ad375b30fd..3c814e6a43a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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]
diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index dc08dd40af9..542f7090ade 100644
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -602,6 +602,7 @@ static int uldap_connection_open(request_rec *r,
                           "ldap_simple_bind() timed out on %s "
                           "connection, dropped by firewall?",
                           new_connection ? "new" : "reused");
+            if (new_connection) break;
         }
         else {
             /* Other errors not retryable */