From: Christophe Jaillet Date: Sun, 19 Jan 2025 11:05:36 +0000 (+0000) Subject: Fix proposal X-Git-Tag: 2.4.63-candidate~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf53e150888fdf978ea90b416a51c0235b41cee7;p=thirdparty%2Fapache%2Fhttpd.git Fix proposal [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923220 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index fda83793d8..0efa26b2c6 100644 --- a/STATUS +++ b/STATUS @@ -186,8 +186,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 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 + *) core: 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 .