From 92d9f509c12a50ce045d98fc08a8ca93ecfab3d4 Mon Sep 17 00:00:00 2001 From: Ruediger Pluem Date: Tue, 3 Jun 2025 15:19:17 +0000 Subject: [PATCH] * Add revision to address jailletc36 concern and reset votes git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926092 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/STATUS b/STATUS index f15d01b205..c1b66db54d 100644 --- a/STATUS +++ b/STATUS @@ -193,26 +193,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: svn merge -c 1925109 ^/httpd/httpd/trunk . +1: rpluem, covener, ylavic - *) 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, jorton, ylavic - jailletc36: Should the apr_palloc() in alloc_systemd_listener() be - apr_pcalloc() so that all fields are 0? - make_sock() uses the 'flags' field that would be - undefined otherwise. - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -248,6 +228,28 @@ PATCHES/ISSUES THAT ARE BEING WORKED does a minor bump only. minfrin: Two new directives need to be documented. + *) 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 + https://svn.apache.org/r1926091 + 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, + jailletc36: Should the apr_palloc() in alloc_systemd_listener() be + apr_pcalloc() so that all fields are 0? + make_sock() uses the 'flags' field that would be + undefined otherwise. + rpluem says: Good catch. Added r1926091 and reset votes. + PATCHES/ISSUES THAT ARE STALLED *) core: avoid duplicate headers when using ap_send_error_response. -- 2.47.2