From: Joe Orton <jorton@apache.org>
Date: Tue, 5 Mar 2024 13:12:09 +0000 (+0000)
Subject: Merged x2.
X-Git-Tag: 2.4.59-rc1-candidate~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3278dcfbad1d497d76d0952186d42194abdbf4be;p=thirdparty%2Fapache%2Fhttpd.git

Merged x2.


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

diff --git a/STATUS b/STATUS
index 30853bb74a0..915a09a855b 100644
--- a/STATUS
+++ b/STATUS
@@ -204,20 +204,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       +1: minfrin
       -1: jorton, appears to be a duplicate of the existing -B option
 
-   *) htpasswd: further fixes for SHA-2 usage/docs
-      trunk patch: https://svn.apache.org/r1862611
-                   https://svn.apache.org/r1878703
-                   https://svn.apache.org/r1884207
-                   https://svn.apache.org/r1877693
-      2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/408.patch
-      Github PR: https://github.com/apache/httpd/pull/408
-      +1: jorton, ylavic, jfclere
-
-   *) htcacheclean: fix output for -A/-a mode
-      trunk patch: https://svn.apache.org/r1915508
-      2.4.x patch: svn merge -c 1915508 ^/httpd/httpd/trunk .
-      +1: jorton, ylavic, jfclere
-
    *) mod_xml2enc: fix XML media type matching to avoid corruption of
       non-XML documents.
       trunk patch: https://svn.apache.org/r1884505