From: Yann Ylavic <ylavic@apache.org>
Date: Sat, 13 Jan 2018 15:58:17 +0000 (+0000)
Subject: Follow up to r1821073: backported.
X-Git-Tag: 2.4.30~144
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b6ef178051b2b195ee4bfc4694c7a0518e8ec2d;p=apache

Follow up to r1821073: backported.

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

diff --git a/STATUS b/STATUS
index 680f515cf0..cf5ec92b4a 100644
--- a/STATUS
+++ b/STATUS
@@ -118,15 +118,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_proxy_html: skip documents < 4 bytes. PR 56286
-     trunk patch: http://svn.apache.org/r1599012
-                  http://svn.apache.org/r1601559
-                  http://svn.apache.org/r1818624   (style only)
-                  http://svn.apache.org/r1819969
-                  http://svn.apache.org/r1819970
-     2.4.x patch: svn merge -c r1599012,r1601559,r1818624, r1819969, r1819970 ^/httpd/httpd/trunk .
-     +1: niq, jim, ylavic, icing
-
   *) mod_md: backport of ACME (Let's Encrypt) support. Needs mod_ssl backport proposal beneath to
      not only compile but do something.
      trunk revisions: 1804530,1804531,1804542,1804545,1804671,1804759,1804787,1804975,1805180,1805188,1805192,1805194,1805256,1805294,1805373,1806939,1807228,1807347,1807577,1807593,1807774,1807777,1808005,1808092,1808100,1808241,1808242,1808243,1808249,1808444,1809719,1809888,1810723,1811082,1811812,1812193,1812517,1812518,1812999,1813642,1814720,1814939,1815005,1815078,1815264,1815370,1815483,1816055,1816154,1816156 and more