promote

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

diff --git a/STATUS b/STATUS
index f39c65fc27f46ff689f3450e47762863e442b0f1..2c1e5c8bbbf4b67f9b246df3d71fd2449c19ea0a 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -105,19 +105,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-  [ New proposals should be added at the end of the list ]
-
- * prefork MPM: simple patch to enable mod_privileges.
-   trunk: N/A (this patch substitutes for the availability of
-               drop_privileges hook).
-   2.2.x patch:
-      http://people.apache.org/~niq/patches/2.2mod_privileges-core-patch
-   wrowe asks; what is proposed and why two patches here?
-   niq replies: removing the second one, it's FYI only and not part
-                of the backport proposal.  And it needs updating!
-   +1: niq
-
  * modules/proxy/proxy_util.c (ap_proxy_initialize_worker): Fix
    gcc strict-aliasing warning.
    Trunk version of patch works:
@@ -132,6 +119,20 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        http://svn.apache.org/viewvc?view=rev&revision=776325
    +1: takashi, rpluem, jim
 
+
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+  [ New proposals should be added at the end of the list ]
+
+ * prefork MPM: simple patch to enable mod_privileges.
+   trunk: N/A (this patch substitutes for the availability of
+               drop_privileges hook).
+   2.2.x patch:
+      http://people.apache.org/~niq/patches/2.2mod_privileges-core-patch
+   wrowe asks; what is proposed and why two patches here?
+   niq replies: removing the second one, it's FYI only and not part
+                of the backport proposal.  And it needs updating!
+   +1: niq
+
  * mod_alias: Ensure Redirect emits HTTP-compliant URLs.
    PR 44020
    trunk patch: