From: Joe Orton <jorton@apache.org>
Date: Fri, 16 Feb 2024 16:26:11 +0000 (+0000)
Subject: Done x2.
X-Git-Tag: 2.4.59-rc1-candidate~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59ee7b0d023e7ac07d06b8117f1a9d41a8c137ab;p=thirdparty%2Fapache%2Fhttpd.git

Done x2.

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

diff --git a/STATUS b/STATUS
index fa88c7661be..47b9f19bca8 100644
--- a/STATUS
+++ b/STATUS
@@ -165,17 +165,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       rpluem says: This has conflict in modules/http2/h2_version.h. Otherwise
       +1 from me on the backport.
 
-   *) mod_slotmem_shm: Use ap_os_is_path_absolute() to make it portable.
-      trunk patch: https://svn.apache.org/r1915400
-      2.4.x patch: svn merge -c 1915400 ^/httpd/httpd/trunk .
-      +1: jfclere, jorton, covener
-
-   *) mod_ssl: use standard OpenSSL function for assembling CA name lists
-      trunk patch: https://svn.apache.org/r1825120
-      2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/406.patch
-      Github PR: https://github.com/apache/httpd/pull/406
-      +1: jorton, jfclere, covener
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]