From: Jean-Frederic Clere <jfclere@apache.org>
Date: Wed, 26 Feb 2020 18:43:41 +0000 (+0000)
Subject: Propose r1874346,1874545 for back port.
X-Git-Tag: 2.4.42~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d2eaa33a1626938c2be9c6302e1e92e6506792f;p=thirdparty%2Fapache%2Fhttpd.git

Propose r1874346,1874545 for back port.


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

diff --git a/STATUS b/STATUS
index e2a323b19c8..20ec62a437b 100644
--- a/STATUS
+++ b/STATUS
@@ -172,6 +172,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1874424 ^/httpd/httpd/trunk .
      +:1 covener
 
+  *) 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
+     2.4.x patch: svn merge -c 1874346 ^/httpd/httpd/trunk .
+     2.4.x patch: svn merge -c 1874545 ^/httpd/httpd/trunk .
+     +1: jfclere
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]