From: Stefan Eissing <icing@apache.org>
Date: Thu, 4 Apr 2019 13:31:37 +0000 (+0000)
Subject: update after backport
X-Git-Tag: 2.4.40~149
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2466cb60953fd9616e069fb605738939f7dc22b0;p=thirdparty%2Fapache%2Fhttpd.git

update after backport

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

diff --git a/STATUS b/STATUS
index 9d04ebbd31e..3caa8a7ed27 100644
--- a/STATUS
+++ b/STATUS
@@ -133,13 +133,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1856297 ^/httpd/httpd/trunk .
      +1: icing, jim, ylavic
 
-  *) modules/filters/config.m4: Make libxml2's inclusion of unicode/*.h files
-     a non-fatal warning/error under maintainer-mode.
-     trunk patch: http://svn.apache.org/r1850745
-                  http://svn.apache.org/r1855446
-     2.4.x patch: svn merge -c 1850745,1855446 ^/httpd/httpd/trunk .
-     +1: jim, covener, icing
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]