From: Joe Orton <jorton@apache.org>
Date: Wed, 29 Mar 2006 14:09:20 +0000 (+0000)
Subject: Fruit hanging low.
X-Git-Tag: 2.2.1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e17e2d3479264397037ea02a52a8a5a8c26e5ed0;p=thirdparty%2Fapache%2Fhttpd.git

Fruit hanging low.


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

diff --git a/STATUS b/STATUS
index a505bf31893..b39b989a616 100644
--- a/STATUS
+++ b/STATUS
@@ -171,7 +171,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     * Fix mis-shifted 32 bit scope, masked to 64 bits as a method, with
       improvement (?) suggested by jorton;
         URL: http://people.apache.org/~wrowe/fixldap_mask.patch
-      +1: wrowe, pquerna, jim
+      +1: wrowe, pquerna, jim, jorton
 
     * mod_include:  APR_FILEPATH_NOTABOVEROOT was undefined with
       a left-hand NULL or empty path.  The SECUREROOTPATH and 
@@ -222,4 +222,14 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 	parameter for all of the directives.
          http://people.apache.org/~bnicholes/util_ldap.c.patch
       +1: bnicholes
-         
+    
+    * Fix instdso.sh install error with some sed implementations (AIX et al)
+        http://issues.apache.org/bugzilla/attachment.cgi?id=17816
+        (http://svn.apache.org/viewcvs?rev=389797&view=rev on trunk)
+      PR: 38108
+      +1: jorton
+
+    * mod_ssl: Fix shmcb possible SIGBUS in shmcb on SPARC et al with gcc >= 4
+        http://svn.apache.org/viewcvs?rev=382799&view=rev
+      PR: 38838
+      +1: jorton