From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 3 Mar 2020 23:06:13 +0000 (+0000)
Subject: Vote, promote.
X-Git-Tag: 2.4.42~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9eb5907313ed709fa790c2340d69a3d1ca309b33;p=thirdparty%2Fapache%2Fhttpd.git

Vote, promote.

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

diff --git a/STATUS b/STATUS
index 03245daae9d..f5dc9b3d389 100644
--- a/STATUS
+++ b/STATUS
@@ -137,6 +137,14 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) modules/filters/mod_deflate.c and mod_brotli.c  don't build with -Werror=format-overflow or configure --enable-maintainer-mod
+     trunk patch: http://svn.apache.org/r1874346 
+     trunk patch: http://svn.apache.org/r1874545
+     trunk patch: http://svn.apache.org/r1874558
+     2.4.x patch: svn merge -c 1874346,1874545,1874558 ^/httpd/httpd/trunk .
+     2.4.x patch also at http://home.apache.org/~gbechis/diffs/mod_deflate-brotli_print-NULL-2.4.diff
+     +1: jfclere, gbechis, ylavic
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -165,33 +173,24 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +:1 covener
      jailletc36: 1874480 and 1874601 are needed to avoid the duplication of 
                 the "CookieTracking" directive in 'command_rec'.
+	 ylavic: +1 with 1874480,1874601
 
   *) authz_groupfile: drop severity of AH0166 (user not found in groupfile)
      from ERR to INFO.
      trunk patch: http://svn.apache.org/r1874424
      2.4.x patch: svn merge -c 1874424 ^/httpd/httpd/trunk .
-     +:1 covener
-
-  *) modules/filters/mod_deflate.c and mod_brotli.c  don't build with -Werror=format-overflow or configure --enable-maintainer-mod
-     trunk patch: http://svn.apache.org/r1874346 
-     trunk patch: http://svn.apache.org/r1874545
-     trunk patch: http://svn.apache.org/r1874558
-     2.4.x patch: svn merge -c 1874346 ^/httpd/httpd/trunk .
-     2.4.x patch: svn merge -c 1874545 ^/httpd/httpd/trunk .
-     2.4.x patch: svn merge -c 1874558 ^/httpd/httpd/trunk .
-     2.4.x patch also at http://home.apache.org/~gbechis/diffs/mod_deflate-brotli_print-NULL-2.4.diff
-     +1: jfclere, gbechis
+     +:1 covener, ylavic
 
   *) mod_proxy_hcheck: Allow %{Content-Type} to work in expressions
      trunk patch: http://svn.apache.org/r1874616
      2.4.x patch:  svn merge -c 1874616 ^/httpd/httpd/trunk .
-     +1: covener
+     +1: covener, ylavic
 
   *) mod_http2: Fixes issue where mod_unique_id would generate non-unique request
      identifier under load, see <https://github.com/icing/mod_h2/issues/195>.
      trunk patch: http://svn.apache.org/r1874689
      2.4.x patch: svn merge -c 1874689 ^/httpd/httpd/trunk .
-     +1: icing
+     +1: icing, ylavic
 
   *) mod_proxy_http: Fix the forwarding of requests with content body when a
      balancer member is unavailable; the retry on the next member was issued