]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Update proposal as per recommendation.
authorGraham Leggett <minfrin@apache.org>
Mon, 20 Nov 2023 16:45:34 +0000 (16:45 +0000)
committerGraham Leggett <minfrin@apache.org>
Mon, 20 Nov 2023 16:45:34 +0000 (16:45 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913987 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 2b63a059fe45ffe513c11e8057ed83e3bcbed523..3b8afcddd2aa3a711454a5a74adaaa96041f5b28 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -208,7 +208,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    *) Add support for SHA-2 crypt() algorithm in htpasswd.
       trunk patch: http://svn.apache.org/r1861793
                    http://svn.apache.org/r1862612
-      2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-htpasswd-SHA-2-crypt.patch
+                   http://svn.apache.org/r1877251
+                   http://svn.apache.org/r1862724
+                   http://svn.apache.org/r1907672
+      2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-htpasswd-SHA-2-crypt-2.patch
       +1: minfrin
       -1: jorton without r1877251, wants r1862724 and maybe r1907672 too?
       ylavic: indeed, my +1 back when these 3 are in