Vote and promote

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

diff --git a/STATUS b/STATUS
index 5f21dbda036044d6ab5aa98644e9c641e0512cbe..e33ff9f513f72ff5c37ea701e8616e5b78e1791d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -137,6 +137,16 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_ssl: fix a potential NULL dereference spotted by gcc 8.1.0
+     mod_http2: silence gcc strncpy warnings which break compilation in
+                maintainer mode with gcc 8.1.0
+     trunk patch: http://svn.apache.org/r1831231
+                  http://svn.apache.org/r1831591
+                  http://svn.apache.org/r1832934
+                  http://svn.apache.org/r1832937
+     2.4.x patch: svn merge -c 1831231,1831591,1832934,1832937 ^/httpd/httpd/trunk .
+     +1: ylavic, icing, jailletc36 (by inspection)
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -189,16 +199,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   (trunk works modulo CHANGES))
      +1: ylavic, jailletc36
 
-  *) mod_ssl: fix a potential NULL dereference spotted by gcc 8.1.0
-     mod_http2: silence gcc strncpy warnings which break compilation in
-                maintainer mode with gcc 8.1.0
-     trunk patch: http://svn.apache.org/r1831231
-                  http://svn.apache.org/r1831591
-                  http://svn.apache.org/r1832934
-                  http://svn.apache.org/r1832937
-     2.4.x patch: svn merge -c 1831231,1831591,1832934,1832937 ^/httpd/httpd/trunk .
-     +1: ylavic, icing
-
   *) mod_proxy: Fix a corner case where the ProxyPassReverseCookieDomain or
      ProxyPassReverseCookiePath directive could fail to update correctly 
      'domain=' or 'path=' in the 'Set-Cookie' header.  PR 61560.