From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 24 May 2022 09:03:58 +0000 (+0000)
Subject: Backported in r1901201 [skip ci]
X-Git-Tag: 2.4.54-rc1-candidate~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b6a2e85560318ca2e7c6b6bbad4725b48d12616;p=thirdparty%2Fapache%2Fhttpd.git

Backported in r1901201 [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901202 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 7fdfd2af49b..7dd7c3adbac 100644
--- a/STATUS
+++ b/STATUS
@@ -148,11 +148,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) 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 .
-     +1: ylavic, rpluem, jorton
-
   *) ab: Allow for TLSv1.3 when the SSL library supports it. BZ 63594 64699
      trunk patches: https://svn.apache.org/r1900157
      2.4.x patches: svn merge -c 1900157 ^/httpd/httpd/trunk .