From 516588e8800d5871e9bc9f15e8666fe2c6760b2c Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Mon, 20 Jan 2025 10:19:28 +0000 Subject: [PATCH] Vote x3, promote x2. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923246 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/STATUS b/STATUS index 494b4cbb17..8346844c1e 100644 --- a/STATUS +++ b/STATUS @@ -157,6 +157,17 @@ 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 ] @@ -170,24 +181,12 @@ 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), rjung (keeps file in sync with trunk), - - *) 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), - *) core: In set_override(), check the return value of set_allow_opts(). Github #310 trunk patch: https://svn.apache.org/r1917017 https://svn.apache.org/r1923218 2.4.x patch: svn merge -c 1917017,1923218 ^/httpd/httpd/trunk . - +1: rjung (reduce code drift), + +1: rjung (reduce code drift), jorton PATCHES/ISSUES THAT ARE BEING WORKED [ New entries should be added at the START of the list ] -- 2.47.2