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/07/16 16:25:46 UTC
svn commit: r1362056 - in /httpd/httpd/branches/2.4.x: ./ CHANGES
include/util_ldap.h
Author: jorton
Date: Mon Jul 16 14:25:46 2012
New Revision: 1362056
URL: http://svn.apache.org/viewvc?rev=1362056&view=rev
Log:
Merge r1348036 from trunk:
* 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)
Reviewed by: jorton, sf, rjung
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/include/util_ldap.h
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1348036
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1362056&r1=1362055&r2=1362056&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Jul 16 14:25:46 2012
@@ -8,6 +8,9 @@ Changes with Apache 2.4.3
possible XSS for a site where untrusted users can upload files to
a location with MultiViews enabled. [Niels Heinen <heinenn google.com>]
+ *) mod_ldap: Treat the "server unavailable" condition as a transient
+ error with all LDAP SDKs. [Filip Valder <filip.valder vsb.cz>]
+
*) core: Fix spurious "not allowed here" error returned when the Options
directive is used in .htaccess and "AllowOverride Options" (with no
specific options restricted) is configured. PR 53444. [Eric Covener]
Modified: httpd/httpd/branches/2.4.x/include/util_ldap.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/util_ldap.h?rev=1362056&r1=1362055&r2=1362056&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/util_ldap.h (original)
+++ httpd/httpd/branches/2.4.x/include/util_ldap.h Mon Jul 16 14:25:46 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