httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r1375696 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS include/util_ldap.h
Date Tue, 21 Aug 2012 17:48:59 GMT
Author: wrowe
Date: Tue Aug 21 17:48:58 2012
New Revision: 1375696

URL: http://svn.apache.org/viewvc?rev=1375696&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.

Backports: r1348036
Submitted by: Filip Valder <filip.valder vsb.cz> (via RH bugzilla)
Reviewed by: rjung, fuankg, wrowe


Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/include/util_ldap.h

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1375696&r1=1375695&r2=1375696&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Aug 21 17:48:58 2012
@@ -10,6 +10,9 @@ Changes with Apache 2.2.23
      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: Add filesystem paths to access denied / access failed messages.
      [Eric Covener]
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1375696&r1=1375695&r2=1375696&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue Aug 21 17:48:58 2012
@@ -99,14 +99,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.2.x patch: http://people.apache.org/~rjung/patches/htdbm-htpasswd-handling_crypt_failure-2_2.patch
      +1: rjung, trawick, wrowe
 
-   * 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)
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1348036
-     2.4.x patch: http://svn.apache.org/viewvc?view=revision&revision=1362056
-     2.2.x patch: http://people.apache.org/~rjung/patches/treat_ldap_unavailable_transient-2_2.patch
-     +1: rjung, fuankg, wrowe
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

Modified: httpd/httpd/branches/2.2.x/include/util_ldap.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/include/util_ldap.h?rev=1375696&r1=1375695&r2=1375696&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/include/util_ldap.h (original)
+++ httpd/httpd/branches/2.2.x/include/util_ldap.h Tue Aug 21 17:48:58 2012
@@ -30,7 +30,7 @@
 #include "apr_time.h"
 #include "apr_ldap.h"
 
-#if APR_HAS_MICROSOFT_LDAPSDK
+#ifdef LDAP_UNAVAILABLE
 #define AP_LDAP_IS_SERVER_DOWN(s)                ((s) == LDAP_SERVER_DOWN \
                 ||(s) == LDAP_UNAVAILABLE)
 #else



Mime
View raw message