From: Jim Jagielski <jim@apache.org>
Date: Mon, 1 Jun 2026 12:53:20 +0000 (+0000)
Subject: Promote some backports
X-Git-Tag: 2.4.68-rc1-candidate~47
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=fde4e5cfd33f9cd6954c0b26c850f1301ce25937;p=thirdparty%2Fapache%2Fhttpd.git

Promote some backports


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

diff --git a/STATUS b/STATUS
index db695d86f0..1fc06ec822 100644
--- a/STATUS
+++ b/STATUS
@@ -184,8 +184,20 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
                   (or https://github.com/apache/httpd/pull/588)
      +1: jorton, rpluem, covener
 
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-  [ New proposals should be added at the end of the list ]
+  *) Update to mod_http2 v2.0.40
+     trunk patch: https://svn.apache.org/r1934628
+     2.4.x patch: svn merge -c 1934628 ^/httpd/httpd/trunk .
+     +1: icing, covener, jim
+
+  *) Update to mod_http2 v2.0.41
+     trunk patch: https://svn.apache.org/r1934678
+     2.4.x patch: svn merge -c 1934678 ^/httpd/httpd/trunk .
+     +1: icing, covener, jim
+
+  *) Update to mod_http2 v2.0.42
+     trunk patch: https://svn.apache.org/r1934743
+     2.4.x patch: svn merge -c 1934743 ^/httpd/httpd/trunk .
+     +1: icing, covener, jim
 
   *) core: Add millisecond time formatting for ErrorLogFormat
      trunk patch: https://svn.apache.org/r1931452
@@ -194,6 +206,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   or https://github.com/apache/httpd/pull/599
      +1: jorton, covener, jim
 
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+  [ New proposals should be added at the end of the list ]
+
   *) Fix compatibility with OpenSSL 4.0
      trunk patch: https://svn.apache.org/1933612 [plus many CI changes]
      2.4.x patch: https://github.com/apache/httpd/pull/642
@@ -206,21 +221,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1934594,1934597 ^/httpd/httpd/trunk .
      +1: jailletc36, jim
 
-  *) Update to mod_http2 v2.0.40
-     trunk patch: https://svn.apache.org/r1934628
-     2.4.x patch: svn merge -c 1934628 ^/httpd/httpd/trunk .
-     +1: icing, covener, jim
-
-  *) Update to mod_http2 v2.0.41
-     trunk patch: https://svn.apache.org/r1934678
-     2.4.x patch: svn merge -c 1934678 ^/httpd/httpd/trunk .
-     +1: icing, covener, jim
-
-  *) Update to mod_http2 v2.0.42
-     trunk patch: https://svn.apache.org/r1934743
-     2.4.x patch: svn merge -c 1934743 ^/httpd/httpd/trunk .
-     +1: icing, covener, jim
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]