From: Christophe Jaillet <jailletc36@apache.org>
Date: Sun, 19 Jan 2025 11:02:51 +0000 (+0000)
Subject: Propose
X-Git-Tag: 2.4.63-candidate~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5162ed4a77ae2df36c3ed3c124dc8bfc8dd06d4f;p=thirdparty%2Fapache%2Fhttpd.git

Propose

[skip ci]

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

diff --git a/STATUS b/STATUS
index 19b784cd33..fda83793d8 100644
--- a/STATUS
+++ b/STATUS
@@ -174,6 +174,25 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: ivan
      +0: jorton - falls under RTC exception for "non-Unix build"
 
+  *) 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), 
+
+  *) 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), 
+
+  *) mod_ssl: In set_override(), check the return value of set_allow_opts().
+              Github #310
+     trunk patch: https://svn.apache.org/r1916054
+                  https://svn.apache.org/r1923218
+     2.4.x patch: svn merge -c 1916054,1923218 ^/httpd/httpd/trunk .
+     +1: jailletc36, 
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]