From: Joe Orton <jorton@apache.org>
Date: Wed, 3 Aug 2005 12:53:08 +0000 (+0000)
Subject: - propose a different OpenLDAP workaround
X-Git-Tag: 2.0.55~116
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61c719f44d898798a2c43eb8e4dbdcb390444a44;p=thirdparty%2Fapache%2Fhttpd.git

- propose a different OpenLDAP workaround
- propose two more mod_ldap fixes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@227213 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 63324729dda..fb0e1054d14 100644
--- a/STATUS
+++ b/STATUS
@@ -390,14 +390,25 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
      *) mod_ldap: Fix for use of OpenLDAP < 2.2.21
         (regression since 2.0.54)
-        http://people.apache.org/~jorton/ap_ldapver.diff
-        +1: jorton, bnicholes
+        http://people.apache.org/~jorton/ap_ldapver2.diff
+        +1: jorton
 
      *) mod_ldap: Fix cache corruption case.
         http://svn.apache.org/viewcvs?rev=225746&view=rev
         PR: 34209
         +1: jorton, bnicholes
 
+     *) mod_ldap: Use the correct shm segment size, fail on
+        apr_rmm_init errors.
+        http://svn.apache.org/viewcvs?rev=225753&view=rev
+        +1: jorton
+
+     *) mod_ldap: Initialize mutex permissions properly so that
+        locking actually works.
+        http://svn.apache.org/viewcvs?rev=105412&view=rev
+        rediff for 2.0.x: http://people.apache.org/~jorton/ap_ldapmutex20.diff
+        +1: jorton
+
 PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:
 
     *) Remove LDAP toolkit specific code from util_ldap and mod_auth_ldap.