From: Graham Leggett <minfrin@apache.org>
Date: Wed, 1 Jan 2020 23:23:59 +0000 (+0000)
Subject: Vote and promote.
X-Git-Tag: 2.4.42~168
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b22c51aef2ca5ac1e89a455c00078e7f2d00af23;p=thirdparty%2Fapache%2Fhttpd.git

Vote and promote.


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

diff --git a/STATUS b/STATUS
index 576362f2f6d..4e73b14568d 100644
--- a/STATUS
+++ b/STATUS
@@ -132,6 +132,11 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_http2: Fix mod_reqtimeout interworking on handshakes. Fix H2Directr config value.
+     trunk patch: http://svn.apache.org/r1870454
+                  http://svn.apache.org/r1870499
+     2.4.x patch: svn merge -c 1870454,1870499 ^/httpd/httpd/trunk .
+     +1: icing, steffenal, minfrin
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -238,12 +243,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                                  https://github.com/apache/httpd/pull/80.diff
      +1: rpluem, covener
 
-  *) mod_http2: Fix mod_reqtimeout interworking on handshakes. Fix H2Directr config value.
-     trunk patch: http://svn.apache.org/r1870454
-                  http://svn.apache.org/r1870499
-     2.4.x patch: svn merge -c 1870454,1870499 ^/httpd/httpd/trunk .
-     +1: icing, steffenal
-
   *) mod_lua: allow nil assignment to trigger apr_table_unset
            (nil assignment to an APR table used to throw an error)
      trunk patch: http://svn.apache.org/r1870650