Backported. [skip ci]

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

diff --git a/STATUS b/STATUS
index 259fc79c662ab914fd7257e2e4111f17fb99dd17..73e86b10340343f29e7f0b9a79bdb07d7324e069 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -141,28 +141,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
- *) mod_proxy: Fix flushing of THRESHOLD_MIN_WRITE data while tunneling.
-                BZ 65294
-     trunk patch: n/a
-     2.4.x patch: http://people.apache.org/~ylavic/patches/pr_65294-v3.patch
-     +1: ylavic, covener, rpluem
-     ylavic: 2.4.x only patch because ap_filter_should_yield() and 
-             ap_filter_output_pending() are wrappers for mod_proxy (only)
-             there. trunk needs fixing too but differently (I'm on it), nothing
-             that will be backported anyway.
-             See https://lists.apache.org/thread.html/r5453925c5caf4d5d64747ada6e05f828106d548d0b8462525699f145%40%3Cdev.httpd.apache.org%3E
-             for the discussion on this, how Rüdiger had foreseen me, and how
-             I did not listen :/
-             (rule of thumb: always listen to him carefully!).
-
-  *) mod_proxy_wstunnel: Add ProxyWebsocketFallbackToProxyHttp to opt-out the
-     fallback to mod_proxy_http for WebSocket upgrade and tunneling.
-     trunk patch: http://svn.apache.org/r1889792
-                  http://svn.apache.org/r1889795
-     2.4.x patch: http://people.apache.org/~ylavic/patches/ProxyWebsocketFallbackToProxyHttp.patch
-                  svn add changes-entries/ProxyWebsocketFallbackToProxyHttp.txt
-     +1: ylavic, covener, rpluem
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]