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: r1496207 - in /httpd/httpd/trunk: CHANGES
 modules/ldap/util_ldap.c
Date: Mon, 24 Jun 2013 20:40:05 -0000
To: cvs@httpd.apache.org
From: covener@apache.org
Message-Id: <20130624204005.C91EE23888E3@eris.apache.org>

Author: covener
Date: Mon Jun 24 20:40:05 2013
New Revision: 1496207

URL: http://svn.apache.org/r1496207
Log:
re-try LDAP connections in a few authz paths.


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=1496207&r1=1496206&r2=1496207&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Jun 24 20:40:05 2013
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_ldap: Retry transient LDAP connection errors when they occur 
+     during the authorization stage. 
+     [Eric Covener]
+
   *) mod_ldap: Don't keep retrying if a new LDAP connection times out.
      [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=1496207&r1=1496206&r2=1496207&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap.c Mon Jun 24 20:40:05 2013
@@ -1113,7 +1113,11 @@ start_over:
     }
 
     if (LDAP_SUCCESS != (result = uldap_connection_open(r, ldc))) {
-        /* connect failed */
+        if (AP_LDAP_IS_SERVER_DOWN(result)) { 
+            failures++;
+            goto start_over;
+        }
+        /* something other than 'server down' */
         return result;
     }
 
@@ -1230,7 +1234,11 @@ start_over:
 
 
     if (LDAP_SUCCESS != (result = uldap_connection_open(r, ldc))) {
-        /* connect failed */
+        failures++;
+        if (AP_LDAP_IS_SERVER_DOWN(result)) { 
+            goto start_over;
+        }
+        /* something other than 'server down' */
         return res;
     }