From: Yann Ylavic <ylavic@apache.org>
Date: Wed, 10 Jan 2018 22:01:00 +0000 (+0000)
Subject: Follow up to r1820798: backported.
X-Git-Tag: 2.4.30~170
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b6a4d0292ca7ac3fafcbf51a9e487c66c38cb9d;p=thirdparty%2Fapache%2Fhttpd.git

Follow up to r1820798: backported.

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

diff --git a/STATUS b/STATUS
index 122d19b530e..e1137784923 100644
--- a/STATUS
+++ b/STATUS
@@ -118,12 +118,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_proxy_html: Save a few bytes in the conf pool when handling
-     'ProxyHTMLDoctype' directive with a user defined  FPI
-     trunk patch: http://svn.apache.org/r1813991
-     2.4.x patch: svn merge -c r1813991 ^/httpd/httpd/trunk .
-     +1: jailletc36, niq, jim
-
   *) mod_ldap: PR61891: Failure to make progreass purging a mostly full cache.
      trunk patch: http://svn.apache.org/r1818040
      2.4.x patch: svn merge -c r1818040  ^/httpd/httpd/trunk .