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 1ad375b30fd9793860e0288849a0a467c6e7eb9e..3c814e6a43a0c6622a2f6d948f93247e7056166c 100644 (file)
--- 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 dc08dd40af9dc5a43fe50d3c65386b9181ede096..542f7090aded8d150def6657b0aefa6747b08976 100644 (file)
--- 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 */