From: Joe Orton <jorton@apache.org>
Date: Mon, 23 May 2022 09:27:17 +0000 (+0000)
Subject: Votes, promotes, [skip ci]
X-Git-Tag: 2.4.54-rc1-candidate~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=394b1ba076e8edba1386cfce95c0c75820a60f66;p=thirdparty%2Fapache%2Fhttpd.git

Votes, promotes, [skip ci]


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

diff --git a/STATUS b/STATUS
index 5ad6bc15a6c..526d89a85a8 100644
--- a/STATUS
+++ b/STATUS
@@ -157,6 +157,24 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      ylavic: I think "extra" should be an apr_size_t.
      icing: added r1899905 with the proposed changes and assertions.
 
+  *) mpm_event: Fix accounting of active/total processes on ungraceful restart. PR 66004
+     trunk patches: https://svn.apache.org/r1899777
+                    https://svn.apache.org/r1899786
+                    https://svn.apache.org/r1899812
+     2.4.x patches: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/313.diff
+                    (from https://github.com/apache/httpd/pull/313)
+     +1: ylavic, rpluem, jorton
+
+  *) core: Disable TCP_NOPUSH optimization on OSX. BZ 66019.
+     trunk patches: https://svn.apache.org/r1900100
+     2.4.x patches: svn merge -c 1900100 ^/httpd/httpd/trunk .
+     +1: ylavic, rpluem, jorton
+
+  *) ab: Allow for TLSv1.3 when the SSL library supports it. BZ 63594 64699
+     trunk patches: https://svn.apache.org/r1900157
+     2.4.x patches: svn merge -c 1900157 ^/httpd/httpd/trunk .
+     +1: ylavic, rpluem, jorton
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -196,24 +214,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      rpluem says: Should we add a CHANGES entry as it seems to fix PR65769?
      ylavic: CHANGES entry added in r1900991
 
-  *) mpm_event: Fix accounting of active/total processes on ungraceful restart. PR 66004
-     trunk patches: https://svn.apache.org/r1899777
-                    https://svn.apache.org/r1899786
-                    https://svn.apache.org/r1899812
-     2.4.x patches: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/313.diff
-                    (from https://github.com/apache/httpd/pull/313)
-     +1: ylavic, rpluem
-
-  *) core: Disable TCP_NOPUSH optimization on OSX. BZ 66019.
-     trunk patches: https://svn.apache.org/r1900100
-     2.4.x patches: svn merge -c 1900100 ^/httpd/httpd/trunk .
-     +1: ylavic, rpluem
-
-  *) ab: Allow for TLSv1.3 when the SSL library supports it. BZ 63594 64699
-     trunk patches: https://svn.apache.org/r1900157
-     2.4.x patches: svn merge -c 1900157 ^/httpd/httpd/trunk .
-     +1: ylavic, rpluem
-
   *) mod_proxy_connect: Ensure that the configured timeout is set on the
      backend socket.
      Trunk version of patch:
@@ -221,7 +221,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      Backport version for 2.4.x of patch:
       Trunk version of patch works
       svn merge -c 1901088 ^/httpd/httpd/trunk .
-     +1: rpluem,
+     +1: rpluem, jorton, 
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]