From c2f72868e53cec15fcec76040310c9c8a8132f99 Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Sun, 4 Aug 2013 01:02:57 +0000 Subject: [PATCH] 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 --- modules/ldap/util_ldap.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c index 3b4aa29e13..324242f563 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"; -- 2.40.0