* Promote some patches

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

diff --git a/STATUS b/STATUS
index aad254ad11dc0186bc1ebc4616d955dad1d01a57..214fe9f9424c2cd5aa8489688d95e217a29845f9 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -122,33 +122,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-  [ please place SVN revisions from trunk here, so it is easy to
-    identify exactly what the proposed changes are!  Add all new
-    proposals to the end of this list. ]
-
-    * mod_ssl: Move thread locking upcall initialization before
-      hardware library initialization, so hardware library can use
-      these upcalls when run in a threaded MPM. Fixes PR 20951. 
-      [adunn at ncipher.com]
-
-      http://people.apache.org/~sctemme/2.0.x-ssl_engine_init.c.patch
-
-      +1: sctemme, rpluem
-
-    *) Reverse Proxy fixes: <Location> bug and Cookie support
-        Patch is at
-        http://people.apache.org/~colm/httpd-2.0-reverse-proxy-cookie.patch
-        and is in production with Clients.
-       +1: niq, wrowe
-         wrowe adds; looks good, no way to apply this without a minor bump
-
-    *) Backport 102870; PR 17217; stop linking OpenSSL .so's to support/*
-       binaries (especially when compiled --with-static-support (!)) and
-       fix mod_ssl.so to compile against .a openssl archives.
-         http://svn.apache.org/viewcvs.cgi?rev=102870&view=rev
-       +1: wrowe, colm
-
     * htdbm: Fix crash in 64-bit mode on HP-UX caused by unexpected
       placement of crypt() prototype (unistd.h).
         Trunk version of patch:
@@ -176,6 +149,33 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       Patch: http://people.apache.org/~jim/patches/cookie-overlay.patch
       +1: jim, wrowe, rpluem
 
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+  [ please place SVN revisions from trunk here, so it is easy to
+    identify exactly what the proposed changes are!  Add all new
+    proposals to the end of this list. ]
+
+    * mod_ssl: Move thread locking upcall initialization before
+      hardware library initialization, so hardware library can use
+      these upcalls when run in a threaded MPM. Fixes PR 20951. 
+      [adunn at ncipher.com]
+
+      http://people.apache.org/~sctemme/2.0.x-ssl_engine_init.c.patch
+
+      +1: sctemme, rpluem
+
+    *) Reverse Proxy fixes: <Location> bug and Cookie support
+        Patch is at
+        http://people.apache.org/~colm/httpd-2.0-reverse-proxy-cookie.patch
+        and is in production with Clients.
+       +1: niq, wrowe
+         wrowe adds; looks good, no way to apply this without a minor bump
+
+    *) Backport 102870; PR 17217; stop linking OpenSSL .so's to support/*
+       binaries (especially when compiled --with-static-support (!)) and
+       fix mod_ssl.so to compile against .a openssl archives.
+         http://svn.apache.org/viewcvs.cgi?rev=102870&view=rev
+       +1: wrowe, colm
+
 PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:
 
     *) mod_headers: Support {...}s tag for SSL variable lookup.