From: Joe Orton <jorton@apache.org>
Date: Mon, 20 Jan 2025 10:28:26 +0000 (+0000)
Subject: Merged x2.
X-Git-Tag: 2.4.63-candidate~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=657f33c08efe4a0001bbe1bb4c82741d32e477ed;p=thirdparty%2Fapache%2Fhttpd.git

Merged x2.


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

diff --git a/STATUS b/STATUS
index 8346844c1e..e090204898 100644
--- a/STATUS
+++ b/STATUS
@@ -157,17 +157,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_cache_socache: Fix a potential null pointer dereference.
-                        PR 69358
-     trunk patch: https://svn.apache.org/r1921067
-     2.4.x patch: svn merge -c 1921067 ^/httpd/httpd/trunk .
-     +1: jailletc36 (by inspection), rjung (keeps file in sync with trunk), jorton
-
-  *) mod_ssl: Check SSL_CTX_new() return value.
-              Github #402
-     trunk patch: https://svn.apache.org/r1916054
-     2.4.x patch: svn merge -c 1916054 ^/httpd/httpd/trunk .
-     +1: jailletc36 (by inspection), rjung (reduce code drift), jorton
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]