From: Eric Covener <covener@apache.org>
Date: Fri, 6 Mar 2020 01:14:32 +0000 (+0000)
Subject: done [skip ci]
X-Git-Tag: 2.4.42~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7e48d350c60242b5cad2a1455f09d247339e5d0;p=thirdparty%2Fapache%2Fhttpd.git

done [skip ci]


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

diff --git a/STATUS b/STATUS
index 59cf2e0e7b9..20bc185e612 100644
--- a/STATUS
+++ b/STATUS
@@ -141,14 +141,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) modules/filters/mod_deflate.c and mod_brotli.c  don't build with -Werror=format-overflow or configure --enable-maintainer-mod
-     trunk patch: http://svn.apache.org/r1874346 
-     trunk patch: http://svn.apache.org/r1874545
-     trunk patch: http://svn.apache.org/r1874558
-     2.4.x patch: svn merge -c 1874346,1874545,1874558 ^/httpd/httpd/trunk .
-     2.4.x patch also at http://home.apache.org/~gbechis/diffs/mod_deflate-brotli_print-NULL-2.4.diff
-     +1: jfclere, gbechis, ylavic
-
   *) mod_ssl: OPENSSL_init_ssl() for openssl-1.1+ on Windows (w/o autoconf).
      trunk patch: http://svn.apache.org/r1874323
      2.4.x patch: svn merge -c 1874323 ^/httpd/httpd/trunk .