From: Rainer Jung <rjung@apache.org>
Date: Tue, 21 Jun 2022 10:30:45 +0000 (+0000)
Subject: Update proposal.
X-Git-Tag: 2.4.55-rc1-candidate~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fd9c4fb428bebee3b30c73721839a06e71b7533;p=thirdparty%2Fapache%2Fhttpd.git

Update proposal.
[skip ci]


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

diff --git a/STATUS b/STATUS
index 32946e50f25..173d005c230 100644
--- 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