vote/promote

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

diff --git a/STATUS b/STATUS
index c188813560c4e78b840843a25af6c2e4a4a95c7b..2b7f5f6b4779e75d3795ca2ab11ce85a0b7873d8 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -117,6 +117,32 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * mpm_winnt: disable the 'data' accept filter entirely to prevent denial of
+     service. PR 59970.
+     trunk patch: http://svn.apache.org/r1758307
+                  http://svn.apache.org/r1758308
+                  http://svn.apache.org/r1758309
+                  http://svn.apache.org/r1758311
+     2.4.x patch: trunk works (modulo CHANGES and APLOGNO's next-number)
+     +1: jchampion, wrowe, covener
+
+   * mpm_winnt: always zero out OVERLAPPED structs when recycling them.
+     trunk patch: http://svn.apache.org/r1758310
+     2.4.x patch: trunk works
+     +1: jchampion, wrowe, covener
+
+   * mod_proxy_connect: Delay some memory allocation
+                        Fix some style (space only)
+     trunk patch: http://svn.apache.org/r1756852
+                  http://svn.apache.org/r1756853
+     2.4.x patch: trunk works
+     +1: jailletc36, jchampion, covener
+
+   * mod_authn_dbd: Remove an unused structure
+     trunk patch: http://svn.apache.org/r1756846
+     2.4.x patch: trunk works
+     +1: jailletc36, jchampion, covener
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -193,20 +219,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://home.apache.org/~ylavic/patches/httpd-2.4.x-r1750392.patch
      +1: ylavic
 
-   * mpm_winnt: disable the 'data' accept filter entirely to prevent denial of
-     service. PR 59970.
-     trunk patch: http://svn.apache.org/r1758307
-                  http://svn.apache.org/r1758308
-                  http://svn.apache.org/r1758309
-                  http://svn.apache.org/r1758311
-     2.4.x patch: trunk works (modulo CHANGES and APLOGNO's next-number)
-     +1: jchampion, wrowe
-
-   * mpm_winnt: always zero out OVERLAPPED structs when recycling them.
-     trunk patch: http://svn.apache.org/r1758310
-     2.4.x patch: trunk works
-     +1: jchampion, wrowe
-
    * mod_status: Delay some memory allocation
                  Fix <p> tag closing syntax
      trunk patch: http://svn.apache.org/r1757010
@@ -215,18 +227,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: jailletc36, jchampion
      jchampion: nitpick: r1757010 introduces trailing whitespace
 
-   * mod_proxy_connect: Delay some memory allocation
-                        Fix some style (space only)
-     trunk patch: http://svn.apache.org/r1756852
-                  http://svn.apache.org/r1756853
-     2.4.x patch: trunk works
-     +1: jailletc36, jchampion
-
-   * mod_authn_dbd: Remove an unused structure
-     trunk patch: http://svn.apache.org/r1756846
-     2.4.x patch: trunk works
-     +1: jailletc36, jchampion
-
 PATCHES/ISSUES THAT ARE BEING WORKED
 
   *) http: Don't remove the Content-Length of zero from a HEAD response if