From: Yann Ylavic Date: Tue, 24 May 2022 09:00:51 +0000 (+0000) Subject: Backported in r1901199 [skip ci] X-Git-Tag: 2.4.54-rc1-candidate~48 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16876fb39a66b911ca07f148e4cab194ac225e78;p=thirdparty%2Fapache%2Fhttpd.git Backported in r1901199 [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901200 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 6d04c3b472f..7fdfd2af49b 100644 --- a/STATUS +++ b/STATUS @@ -148,14 +148,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) mpm_event: Fix accounting of active/total processes on ungraceful restart. PR 66004 - trunk patches: https://svn.apache.org/r1899777 - https://svn.apache.org/r1899786 - https://svn.apache.org/r1899812 - 2.4.x patches: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/313.diff - (from https://github.com/apache/httpd/pull/313) - +1: ylavic, rpluem, jorton - *) core: Disable TCP_NOPUSH optimization on OSX. BZ 66019. trunk patches: https://svn.apache.org/r1900100 2.4.x patches: svn merge -c 1900100 ^/httpd/httpd/trunk .