You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2012/06/08 14:19:30 UTC
svn commit: r1348036 - in /httpd/httpd/trunk: CHANGES include/util_ldap.h
Author: jorton
Date: Fri Jun 8 12:19:30 2012
New Revision: 1348036
URL: http://svn.apache.org/viewvc?rev=1348036&view=rev
Log:
* include/util_ldap.h: Treat LDAP_UNAVAILABLE as a transient error
with non-MS LDAP SDKs; seen with OpenLDAP against Novell eDirectory.
Submitted by: Filip Valder <filip.valder vsb.cz> (via RH bugzilla)
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/include/util_ldap.h
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1348036&r1=1348035&r2=1348036&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri Jun 8 12:19:30 2012
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.5.0
+ *) mod_ldap: Treat the "server unavailable" condition as a transient
+ error with all LDAP SDKs. [Filip Valder <filip.valder vsb.cz>]
+
*) mod_ssl: Add support for TLS-SRP (Secure Remote Password key exchange
for TLS, RFC 5054). PR 51075. [Quinn Slack <sqs cs stanford edu>,
Christophe Renou, Peter Sylvester]
Modified: httpd/httpd/trunk/include/util_ldap.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/util_ldap.h?rev=1348036&r1=1348035&r2=1348036&view=diff
==============================================================================
--- httpd/httpd/trunk/include/util_ldap.h (original)
+++ httpd/httpd/trunk/include/util_ldap.h Fri Jun 8 12:19:30 2012
@@ -45,7 +45,7 @@
/* this whole thing disappears if LDAP is not enabled */
#if APR_HAS_LDAP
-#if APR_HAS_MICROSOFT_LDAPSDK
+#ifdef LDAP_UNAVAILABLE
#define AP_LDAP_IS_SERVER_DOWN(s) ((s) == LDAP_SERVER_DOWN \
||(s) == LDAP_UNAVAILABLE)
#else