From: Eric Covener <covener@apache.org>
Date: Sun, 4 Aug 2013 01:02:57 +0000 (+0000)
Subject: retry during a timeout in uldap_cache_checkuserid(), like other paths that check
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3ca46a5482cc4628fc95e3dd683d6f17dbbf7ea;p=thirdparty%2Fapache%2Fhttpd.git

retry during a timeout in uldap_cache_checkuserid(), like other paths that check
server down and TIMEOUT together.



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

diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index 3b4aa29e135..324242f563c 100644
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -1728,6 +1728,14 @@ start_over:
         goto start_over;
     }
 
+    if (result == LDAP_TIMEOUT) {
+        ldc->reason = "ldap_search_ext_s() for user failed with timeout";
+        uldap_connection_unbind(ldc);
+        failures++;
+        goto start_over;
+    }
+
+
     /* if there is an error (including LDAP_NO_SUCH_OBJECT) return now */
     if (result != LDAP_SUCCESS) {
         ldc->reason = "ldap_search_ext_s() for user failed";