ipromote

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

diff --git a/STATUS b/STATUS
index ef40ef1fdc467ffb3410f545fbc81249e02b2d96..0da1daf1cec1f7981cb56ea7eabc927ff17fde92 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -104,6 +104,34 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works
      +1: mrumph, jim, covener
 
+   * mod_ssl: enable auto curve selection for ECDHE / OpenSSL 1.0.2
+     trunk patch: https://svn.apache.org/r1563420
+     2.4.x patch: trunk patch works
+     +1: kbrand, drh, ylavic
+
+   * mod_remoteip: Correct the trusted proxy match test. PR54651
+     trunk patch: https://svn.apache.org/r1564052
+     2.4.x patch: trunk works
+     +1: mrumph, covener, jim
+
+   * mod_proxy_fcgi: Fix error message when an unexpected protocol version
+     number is received from the application.  PR 56110.
+     trunk patch: http://svn.apache.org/r1564756
+     2.4.x patch: trunk patch works with manipulation of CHANGES
+     +1: trawick, jim, jailletc36
+
+  * event fdqueue: Use a normalized offset point for idlers via atomics
+    trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1545286
+                 http://svn.apache.org/viewvc?view=revision&revision=1545292
+                 http://svn.apache.org/viewvc?view=revision&revision=1545325
+                 http://svn.apache.org/viewvc?view=revision&revision=1545364
+                 http://svn.apache.org/viewvc?view=revision&revision=1545408
+                 http://svn.apache.org/viewvc?view=revision&revision=1545411
+    2.4.x patch: http://people.apache.org/~jim/patches/fdq-atomicsv2.patch
+    +1: jim, trawick, ylavic
+    ylavic notes: the v2 patch won't apply since r1562134 (typedef removed on
+                  struct recycled_pool conflicts). +1 still with an easy patch
+                  update, works on linux 32/64-bit.
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -134,18 +162,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch: trunk patch works mod CHANGES
     +1: jim, covener
 
-  * event fdqueue: Use a normalized offset point for idlers via atomics
-    trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1545286
-                 http://svn.apache.org/viewvc?view=revision&revision=1545292
-                 http://svn.apache.org/viewvc?view=revision&revision=1545325
-                 http://svn.apache.org/viewvc?view=revision&revision=1545364
-                 http://svn.apache.org/viewvc?view=revision&revision=1545408
-                 http://svn.apache.org/viewvc?view=revision&revision=1545411
-    2.4.x patch: http://people.apache.org/~jim/patches/fdq-atomicsv2.patch
-    +1: jim, trawick, ylavic
-    ylavic notes: the v2 patch won't apply since r1562134 (typedef removed on
-                  struct recycled_pool conflicts). +1 still with an easy patch
-                  update, works on linux 32/64-bit.
 
   * FreeBSD: Disable IPv4-mapped listening sockets by default for versions
     5+ instead of just for FreeBSD 5. PR 53824.
@@ -201,22 +217,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: https://people.apache.org/~kbrand/mod_ssl-2.4.x-certkeyfile-v3.diff
      +1: kbrand
 
-   * mod_ssl: enable auto curve selection for ECDHE / OpenSSL 1.0.2
-     trunk patch: https://svn.apache.org/r1563420
-     2.4.x patch: trunk patch works
-     +1: kbrand, drh, ylavic
-
-   * mod_remoteip: Correct the trusted proxy match test. PR54651
-     trunk patch: https://svn.apache.org/r1564052
-     2.4.x patch: trunk works
-     +1: mrumph, covener, jim
-
-   * mod_proxy_fcgi: Fix error message when an unexpected protocol version
-     number is received from the application.  PR 56110.
-     trunk patch: http://svn.apache.org/r1564756
-     2.4.x patch: trunk patch works with manipulation of CHANGES
-     +1: trawick, jim, jailletc36
-
    * Easy proposals to synch 2.4 and trunk
         - server/protocol.c (r_flush): Use int return type as per declaration
           of apr_vformatter(); no functional change.