From d22e1b5503adb3ad461e2cf2f119ac311dc5e4c4 Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Sat, 18 Nov 2023 11:19:16 +0000 Subject: [PATCH] Promote. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913908 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/STATUS b/STATUS index 18d7f4328d9..4d012c1b70c 100644 --- a/STATUS +++ b/STATUS @@ -153,6 +153,13 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] + *) mod_ssl: release memory to the OS when needed + Trunk version of patch: + https://svn.apache.org/r1898410 + https://svn.apache.org/r1898366 + svn merge -c 1898366 ^/httpd/httpd/trunk . + svn merge -c 1898410 ^/httpd/httpd/trunk . + +1: gbechis, ylavic, jorton PATCHES PROPOSED TO BACKPORT FROM TRUNK: @@ -177,14 +184,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: svn merge -c 1912415 ^/httpd/httpd/trunk . +1: jfclere - *) mod_ssl: release memory to the OS when needed - Trunk version of patch: - https://svn.apache.org/r1898410 - https://svn.apache.org/r1898366 - svn merge -c 1898366 ^/httpd/httpd/trunk . - svn merge -c 1898410 ^/httpd/httpd/trunk . - +1: gbechis, ylavic, jorton - *) mod_ssl: fix LibreSSL build Trunk version of patch: https://svn.apache.org/r1874101 -- 2.47.2