From: Christophe Jaillet <jailletc36@apache.org>
Date: Sun, 20 Feb 2022 15:13:41 +0000 (+0000)
Subject: Update proposal
X-Git-Tag: 2.4.53-rc1-candidate~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42da121d5477058ef38a818b9173e94219fc03e8;p=thirdparty%2Fapache%2Fhttpd.git

Update proposal

[skip ci]

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

diff --git a/STATUS b/STATUS
index 7f89fc694bf..68102945a0f 100644
--- a/STATUS
+++ b/STATUS
@@ -332,11 +332,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         - mod_socache_memcache
         - mod_authn_dbd
         - mod_log_config
+        - mod_proxy_ftp and proxy-util
      trunk patch:
           https://svn.apache.org/r1897325
           https://svn.apache.org/r1897326
           https://svn.apache.org/r1897329
-     2.4.x patch: svn merge -c 1897325,1897326,1897329 ^/httpd/httpd/trunk .
+          https://svn.apache.org/r1898255
+     2.4.x patch: svn merge -c 1897325,1897326,1897329,1898255 ^/httpd/httpd/trunk .
      +1: jailletc36
 
 PATCHES/ISSUES THAT ARE BEING WORKED