From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 7 Nov 2019 12:16:37 +0000 (+0000)
Subject: Vote, promote.
X-Git-Tag: 2.4.42~225
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a16de3092a3b1d2b0189f7ce12d5ab4847ae247f;p=thirdparty%2Fapache%2Fhttpd.git

Vote, promote.

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

diff --git a/STATUS b/STATUS
index ae59758cd87..0860fc88922 100644
--- a/STATUS
+++ b/STATUS
@@ -131,6 +131,14 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   *) mod_deflate, mod_brotli: Honor "Accept-Encoding: foo;q=0" as per RFC 7231;
+                               which means 'foo' is "not acceptable".
+                               PR 58158
+      trunk patch: http://svn.apache.org/r1868313
+      2.4.x patch: svn merge -c 1868313 ^/httpd/httpd/trunk .
+      +1: jailletc36, jim, ylavic
+      jailletc36: tests added in r1868312.
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -191,14 +199,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: svn merge -c 1865405 ^/httpd/httpd/trunk .
       +1: jailletc36, jim
 
-   *) mod_deflate, mod_brotli: Honor "Accept-Encoding: foo;q=0" as per RFC 7231;
-                               which means 'foo' is "not acceptable".
-                               PR 58158
-      trunk patch: http://svn.apache.org/r1868313
-      2.4.x patch: svn merge -c 1868313 ^/httpd/httpd/trunk .
-      +1: jailletc36, jim
-      jailletc36: tests added in r1868312.
-
    *) mod_log_config: Parts of r1331110 is missing in back-port in 2.4.x done
                       in r1430514. Add it now.
       trunk patch: http://svn.apache.org/r1331110