From: Ruediger Pluem Date: Mon, 10 Feb 2025 14:29:27 +0000 (+0000) Subject: * Promote X-Git-Tag: 2.4.64-rc1-candidate~103 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=578e524edac0f3b461f47542f184837704434813;p=thirdparty%2Fapache%2Fhttpd.git * Promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923699 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index c10c54ef4a..46985140ab 100644 --- a/STATUS +++ b/STATUS @@ -158,10 +158,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - -PATCHES PROPOSED TO BACKPORT FROM TRUNK: - [ New proposals should be added at the end of the list ] - *) CMake: Remove awk dependency when building using CMake. Before this awk was required for -DWITH_MODULES option. trunk patch: https://svn.apache.org/r1919413 @@ -178,6 +174,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch: svn merge -c 1917017,1923218 ^/httpd/httpd/trunk . +1: rjung (reduce code drift), jorton, jailletc36 + +PATCHES PROPOSED TO BACKPORT FROM TRUNK: + [ New proposals should be added at the end of the list ] + *) mod_systemd: Add systemd socket activation Trunk version of patch: https://svn.apache.org/r1511033