]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Update proposal.
authorRainer Jung <rjung@apache.org>
Tue, 21 Jun 2022 10:30:45 +0000 (10:30 +0000)
committerRainer Jung <rjung@apache.org>
Tue, 21 Jun 2022 10:30:45 +0000 (10:30 +0000)
[skip ci]

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

STATUS

diff --git a/STATUS b/STATUS
index 32946e50f25b7aef6b25ee3a15f6e69e268ee17a..173d005c230490f74d52fef6d4e4c146fcd9ecff 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -207,7 +207,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      PR 66131.  [Jérôme Billiras]
      Trunk version of patch:
         https://svn.apache.org/r1902117
-     2.4.x patch: svn merge -c 1902117 ^/httpd/httpd/trunk .
+        https://svn.apache.org/r1902130
+        https://svn.apache.org/r1902132
+        https://svn.apache.org/r1902133
+     2.4.x patch: svn merge -c 1902117,1902130,1902132,1902133 ^/httpd/httpd/trunk .
      +1: rjung,
 
 PATCHES/ISSUES THAT ARE BEING WORKED