From: Stefan Eissing <icing@apache.org>
Date: Thu, 3 Mar 2022 09:32:22 +0000 (+0000)
Subject: cleanup after backport [skip ci]
X-Git-Tag: 2.4.53-rc1-candidate~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b0616ada3f2353cffb2bf4459082e7480d66aae;p=thirdparty%2Fapache%2Fhttpd.git

cleanup after backport [skip ci]


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

diff --git a/STATUS b/STATUS
index bc07615ca5e..e5bf7d20c90 100644
--- a/STATUS
+++ b/STATUS
@@ -147,18 +147,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_proxy: Use the maxium of front end and backend timeouts instead of the
-     minimum when tunneling requests (websockets, CONNECT requests).
-     Backend timeouts can be configured more selectively (per worker if needed)
-     as front end timeouts and typically the backend timeouts reflect the
-     application requirements better.  PR 65886
-     Trunk version of patch:
-        https://svn.apache.org/r1898127
-     Backport version for 2.4.x of patch:
-       https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/295.diff
-     Can be applied via apply_backport_pr.sh 295
-     +1: rpluem, ylavic, icing
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]