Commit e0307334 authored by Joe Orton's avatar Joe Orton
Browse files

Satisfy merging fix. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@105217 13f79535-47bb-0310-9956-ffa450edef68
parent 9cb9c3e7

STATUS

+6 −1
Changes for STATUS: 6 added lines, 1 removed line.
Original line number Diff line number Diff line 
APACHE 2.0 STATUS:                                              -*-text-*-

Last modified at [$Date: 2004/09/20 13:25:46 $]

Last modified at [$Date: 2004/09/20 20:31:27 $]



Release:
@@ -74,6 +74,11 @@ PATCHES TO BACKPORT FROM 2.1 
  [ please place file names and revisions from HEAD here, so it is easy to

    identify exactly what the proposed changes are! ]



    *) Fix Satisfy merging regression in 2.0.51.

       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/core.c?r1=1.285&r2=1.286    

       PR: 31315

       +1: jorton



    *) Fix the global mutex crash when the global mutex is never allocated

       due to disabled/empty caches.

         modules/ldap/util_ldap.c: 1.13