From: Eric Covener <covener@apache.org>
Date: Sat, 17 Apr 2021 20:09:08 +0000 (+0000)
Subject: promote/vote
X-Git-Tag: 2.4.47~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ea6c5130763956f6f6f11fe03dfe4b064826e8d;p=thirdparty%2Fapache%2Fhttpd.git

promote/vote

[skip ci]


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

diff --git a/STATUS b/STATUS
index 252776ead74..c2c477c1554 100644
--- a/STATUS
+++ b/STATUS
@@ -137,6 +137,19 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+ *) mpm_event/worker: Adjust signal handler before unblocking. PR 64533.
+     trunk patch: http://svn.apache.org/r1882370
+     2.4.x patch: svn merge -c 1882370 ^/httpd/httpd/trunk .
+     +1: ylavic, jorton, icing
+
+  *) mod_http2: fixes a race when checking short responses with
+     an intermediate 1xx status. Before seeing the real response status, the
+     HTTP/2 noticed the EOF on the data. This led to protocol reset of the
+     stream and the valid response was not sent.
+     trunk patch: http://svn.apache.org/r1888087
+     2.4.x patch: svn merge -c 1888087 ^/httpd/httpd/trunk .
+     +1: icing, rpluem, covener
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -158,12 +171,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      PR: https://github.com/apache/httpd/pull/176
      +1: jorton, 
 
-  *) mpm_event/worker: Adjust signal handler before unblocking. PR 64533.
-     trunk patch: http://svn.apache.org/r1882370
-     2.4.x patch: svn merge -c 1882370 ^/httpd/httpd/trunk .
-     +1: ylavic, jorton, icing
-
-  *) core/mod_ssl/mod_md:
+   *) core/mod_ssl/mod_md:
      - adding new ap_ssl_*() functions for a backward
        compatible replacement of the major optional mod_ssl functions. This
        allows other ssl modules to work without impersonating mod_ssl and
@@ -184,15 +192,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      Make sure that conn->keepalive is NOT reset after being set in ap_read_request().
      trunk patch: http://svn.apache.org/r1887999
      2.4.x patch: svn merge -c 1887999 ^/httpd/httpd/trunk .
-     +1: jfclere
-
-  *) mod_http2: fixes a race when checking short responses with
-     an intermediate 1xx status. Before seeing the real response status, the
-     HTTP/2 noticed the EOF on the data. This led to protocol reset of the
-     stream and the valid response was not sent.
-     trunk patch: http://svn.apache.org/r1888087
-     2.4.x patch: svn merge -c 1888087 ^/httpd/httpd/trunk .
-     +1: icing, rpluem
+     +1: jfclere, covener
 
   *) mod_socache_shmcb: be safe from socache_shmcb_destroy() late call.  PR 59798
      trunk patch: http://svn.apache.org/r1888266