Commit bd117d53 authored by Rainer Jung's avatar Rainer Jung
Browse files

mod_ldap: Fix regression in handling "server unavailable" errors on 

Windows. Followup to r1375696.

PR 54140.

Backport of r1408402 from trunk resp. r1409773 from 2.4.x.

Submitted by: covener
Reviewed by: wrowe, rjung
Backported by: covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1445119 13f79535-47bb-0310-9956-ffa450edef68
parent 8f7dfdff

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.2.24



  *) mod_ldap: Fix regression in handling "server unavailable" errors on

     Windows.  PR 54140.  [Eric Covener]



  *) mod_ssl: fix a regression with the string rendering of the "UID" RDN

     introduced in 2.2.15. PR 54510. [Kaspar Brand]

STATUS

+0 −7
Original line number Diff line number Diff line
@@ -101,13 +101,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
     2.2.x documentation patch : http://apache-doc-fr.gryzor.com/fallbackresource_disabled_2.2_doc.patch

     +1: gryzor, wrowe, rjung



   * mod_ldap: restore LDAP_UNAVAILABLE for windows SDK (PR 54140)

     trunk patch: http://svn.apache.org/viewvc?rev=1408402&view=rev

     2.4.x patch: http://svn.apache.org/viewvc?rev=1409773&view=rev

     2.2.x patch: http://people.apache.org/~covener/patches/httpd-2.2.x-ldap_unavailable.diff 

                 (just context conflicts)

     +1: covener, wrowe, rjung



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

include/util_ldap.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include "apr_time.h"

#include "apr_ldap.h"



#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