From d5f92a96dbb71827cebff19d5aaf63af2ab29ef6 Mon Sep 17 00:00:00 2001 From: Ruediger Pluem Date: Mon, 10 Feb 2025 14:22:43 +0000 Subject: [PATCH] * Propose git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923697 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/STATUS b/STATUS index ac6177a1bb..c10c54ef4a 100644 --- a/STATUS +++ b/STATUS @@ -178,6 +178,23 @@ 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 + *) mod_systemd: Add systemd socket activation + Trunk version of patch: + https://svn.apache.org/r1511033 + https://svn.apache.org/r1528032 + https://svn.apache.org/r1608686 + https://svn.apache.org/r1608694 + https://svn.apache.org/r1608703 + https://svn.apache.org/r1838271 + https://svn.apache.org/r1899784 + https://svn.apache.org/r1916312 + https://svn.apache.org/r1916344 + Backport version for 2.4.x of patch: + https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/515.diff + Can be applied via apply_backport_pr.sh 515 + +1: rpluem + + PATCHES/ISSUES THAT ARE BEING WORKED [ New entries should be added at the START of the list ] -- 2.47.2