From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 8 Apr 2019 18:58:43 +0000 (+0000)
Subject: Vote, promote and propose.
X-Git-Tag: 2.4.40~145
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=02eee306645672b6963ffb68eb60fcb649de7386;p=thirdparty%2Fapache%2Fhttpd.git

Vote, promote and propose.

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

diff --git a/STATUS b/STATUS
index 2ae4a660195..7ec73635024 100644
--- a/STATUS
+++ b/STATUS
@@ -127,6 +127,10 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_http2: remove the no longer existing h2_ngn_shed.c from Cmake.
+     trunk patch: http://svn.apache.org/r1856910
+     2.4.x patch: svn merge -c 1856910 ^/httpd/httpd/trunk .
+     +1: icing, covener, ylavic
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -211,10 +215,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://people.apache.org/~ylavic/patches/httpd-2.4.x-forward_100_continue-v5.patch
      +1: ylavic, jim
 
-  *) mod_http2: remove the no longer existing h2_ngn_shed.c from Cmake.
-     trunk patch: http://svn.apache.org/r1856910
-     2.4.x patch: svn merge -c 1856910 ^/httpd/httpd/trunk .
-     +1: icing, covener
+  *) mod_reqtimeout: Fix default rates missing in 2.4.39. PR 63325
+     trunk patch: http://svn.apache.org/r1857129
+                  http://svn.apache.org/r1857130
+     2.4.x patch: svn merge -c 1857129,1857130 ^/httpd/httpd/trunk .
+     +1: ylavic
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]