]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Update proposal
authorChristophe Jaillet <jailletc36@apache.org>
Sun, 20 Feb 2022 15:13:41 +0000 (15:13 +0000)
committerChristophe Jaillet <jailletc36@apache.org>
Sun, 20 Feb 2022 15:13:41 +0000 (15:13 +0000)
[skip ci]

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

STATUS

diff --git a/STATUS b/STATUS
index 7f89fc694bfacc6846e9dd08765817fc1c571abb..68102945a0f50fd90e688d30e03c0ce5ddbc87b7 100644 (file)
--- 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