From: Stefan Eissing <icing@apache.org>
Date: Thu, 25 Feb 2016 09:00:03 +0000 (+0000)
Subject: update after merge
X-Git-Tag: 2.4.19~159
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e96b279964459cdf0ae9cb2df659af2dd3c9b8eb;p=apache

update after merge

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

diff --git a/STATUS b/STATUS
index bc35d2d0de..b0dd73f27c 100644
--- a/STATUS
+++ b/STATUS
@@ -112,25 +112,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_proxy_wstunnel, mod_proxy_connect: Use the correct pool and allocator
-     lifetime when sending brigades and buckets down the filter chain to the
-     backend and the client in mod_proxy_wstunnel and mod_proxy_connect.
-     Trunk version of patch:
-          http://svn.apache.org/r1726776
-          http://svn.apache.org/r1726779
-          http://svn.apache.org/r1726781
-          http://svn.apache.org/r1726782
-          http://svn.apache.org/r1726787
-          http://svn.apache.org/r1727551
-          http://svn.apache.org/r1727553
-          http://svn.apache.org/r1727567
-          http://svn.apache.org/r1728478
-          http://svn.apache.org/r1728481
-          http://svn.apache.org/r1730823
-     Backport version for 2.4.x of patch:
-        http://home.apache.org/~rpluem/patches/proxy_correctlifetime.diff
-     +1: rpluem, jim, icing
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]