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/11/15 14:47:47 UTC
svn commit: r1409773 - in /httpd/httpd/branches/2.4.x: ./ CHANGES
include/util_ldap.h
Author: jorton
Date: Thu Nov 15 13:47:46 2012
New Revision: 1409773
URL: http://svn.apache.org/viewvc?rev=1409773&view=rev
Log:
Merge 1408402 from trunk:
followup to r1348036, MSSDK's WinLdap.h uses an enum for LDAP_* status codes, so the block is not included
Submitted by: covener
Reviewed by: covener, trawick, igalic
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:r1408402
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1409773&r1=1409772&r2=1409773&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Thu Nov 15 13:47:46 2012
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.4.4
+
+ *) mod_ldap: Fix regression in handling "server unavailable" errors on
+ Windows. PR 54140. [Eric Covener]
*) syslog logging: Remove stray ", referer" at the end of some messages.
[Jeff Trawick]
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=1409773&r1=1409772&r2=1409773&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/util_ldap.h (original)
+++ httpd/httpd/branches/2.4.x/include/util_ldap.h Thu Nov 15 13:47:46 2012
@@ -45,7 +45,7 @@
/* this whole thing disappears if LDAP is not enabled */
#if APR_HAS_LDAP
-#ifdef LDAP_UNAVAILABLE
+#if defined(LDAP_UNAVAILABLE) || APR_HAS_MICROSOFT_LDAPSDK
#define AP_LDAP_IS_SERVER_DOWN(s) ((s) == LDAP_SERVER_DOWN \
||(s) == LDAP_UNAVAILABLE)
#else