From: Yann Ylavic <ylavic@apache.org>
Date: Wed, 19 Jun 2024 13:43:44 +0000 (+0000)
Subject: Update proposal (again).
X-Git-Tag: 2.4.60-rc1-candidate~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa86200d20dca8c94138c49eb27343ed18dfbf5e;p=thirdparty%2Fapache%2Fhttpd.git

Update proposal (again).

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

diff --git a/STATUS b/STATUS
index 9fbda8d2271..588d3576857 100644
--- a/STATUS
+++ b/STATUS
@@ -227,9 +227,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
   *) mod_proxy: Fix DNS requests and connections closed before the
      configured addressTTL.  BZ 69126.
-     trunk patch: http://svn.apache.org/r1918410
+     trunk patch: http://svn.apache.org/r1918228
+                  http://svn.apache.org/r1918410
                   http://svn.apache.org/r1918412
                   http://svn.apache.org/r1918429
+                  http://svn.apache.org/r1918438
      2.4.x patch: trunk works, or
                   https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/454.diff
      PR: https://github.com/apache/httpd/pull/454