]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
update backport revisions with proper module name in change entry
authorStefan Eissing <icing@apache.org>
Tue, 4 Mar 2025 09:10:56 +0000 (09:10 +0000)
committerStefan Eissing <icing@apache.org>
Tue, 4 Mar 2025 09:10:56 +0000 (09:10 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1924165 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 62610e850bebf1bc8bbdd3807a2913c976886afd..61bd7837eed324ead27776974223e9815bb75bbd 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -206,8 +206,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) mod_http2: update to v2.0.30
      Trunk version of patch:
         https://svn.apache.org/r1924145
+        https://svn.apache.org/r1924164
      Backport version for 2.4.x of patch:
-        svn merge -c 1924145 ^/httpd/httpd/trunk .
+        svn merge -c 1924145,r1924164 ^/httpd/httpd/trunk .
      +1: icing
 
 PATCHES/ISSUES THAT ARE BEING WORKED