promote

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

diff --git a/STATUS b/STATUS
index 96c296af0ce71ae64a9b4b5d2ae24540ce90de41..b40a4490b1e37e16a2ebd1bfd36d5454dec6e1a1 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -96,6 +96,30 @@ CURRENT RELEASE NOTES:
 
 RELEASE SHOWSTOPPERS:
 
+
+PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
+  [ start all new proposals below, under PATCHES PROPOSED. ]
+
+   * Easy patches - synch with trunk
+        core: avoid a double apr_time_now() call on the first succeeding read.
+        mod_proxy_balancer: Correctly escape user provided data.
+        mod_usertrack: Save a few bytes of memory. This can be done in temp_pool
+        mod_cache: Fix layout
+        mod_cache_socache: Don't pass uninitialized rv passed to ap_log_rerror()
+                           Stop throwing away a pointer on the heap
+        mod_cache: add the URI to DEBUG message 00765
+        heartbeat: Doxygen fix + reorg to match how other header files are built
+     trunk patch:
+        http://svn.apache.org/r1572905
+        http://svn.apache.org/r1595305
+        http://svn.apache.org/r1597182
+        http://svn.apache.org/r1586827
+        http://svn.apache.org/r1534892
+        http://svn.apache.org/r1563193
+        http://svn.apache.org/r1597639
+     2.4.x patch:  http://people.apache.org/~jailletc36/backport8.patch
+     +1: jailletc36, ylavic, jim
+
    * mod_proxy_fcgi: Repair sending empty stdin after r1601749 (i.e., regression
      in 2.4.x branch after 2.4.9), repair lost error condition
      trunk: http://svn.apache.org/r1603027
@@ -109,10 +133,6 @@ RELEASE SHOWSTOPPERS:
      trawick: the patch resolves a conflict when merging these revisions
               if r1592032 is not yet in the 2.4.x branch
 
-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 ]
@@ -242,26 +262,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: jailletc36, ylavic
      trawick: you probably want r1601995
 
-   * Easy patches - synch with trunk
-        core: avoid a double apr_time_now() call on the first succeeding read.
-        mod_proxy_balancer: Correctly escape user provided data.
-        mod_usertrack: Save a few bytes of memory. This can be done in temp_pool
-        mod_cache: Fix layout
-        mod_cache_socache: Don't pass uninitialized rv passed to ap_log_rerror()
-                           Stop throwing away a pointer on the heap
-        mod_cache: add the URI to DEBUG message 00765
-        heartbeat: Doxygen fix + reorg to match how other header files are built
-     trunk patch:
-        http://svn.apache.org/r1572905
-        http://svn.apache.org/r1595305
-        http://svn.apache.org/r1597182
-        http://svn.apache.org/r1586827
-        http://svn.apache.org/r1534892
-        http://svn.apache.org/r1563193
-        http://svn.apache.org/r1597639
-     2.4.x patch:  http://people.apache.org/~jailletc36/backport8.patch
-     +1: jailletc36, ylavic, jim
-
    * ab: support custom HTTP method with -m argument. PR 56604.
      trunk patch: http://svn.apache.org/r1601076
                   http://svn.apache.org/r1601680