From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 29 May 2018 21:07:20 +0000 (+0000)
Subject: Backported in r1832485.
X-Git-Tag: 2.4.34~157
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a1f798513586d1df720b084869c9773b483dd38;p=thirdparty%2Fapache%2Fhttpd.git

Backported in r1832485.

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

diff --git a/STATUS b/STATUS
index 7a4daf06c76..ecb10dc13f8 100644
--- a/STATUS
+++ b/STATUS
@@ -180,22 +180,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1828879 ^/httpd/httpd/trunk .
      +1: icing, jim, ylavic
 
-  *) mod_proxy: Do not restrict the maximum pool size for backend connections any
-     longer by the maximum number of threads per process and use a better default
-     if mod_http2 is loaded.
-     Trunk version of patch:
-      http://svn.apache.org/r1822849
-      http://svn.apache.org/r1822858
-      http://svn.apache.org/r1822878
-      http://svn.apache.org/r1822879
-      http://svn.apache.org/r1822883
-      http://svn.apache.org/r1828485
-     Changes in r1828493
-   Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1822849,1822858,1822878,1822879,1822883,1828485 ^/httpd/httpd/trunk .
-   +1: rpluem, jim, ylavic
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]