From: Giovanni Bechis <gbechis@apache.org>
Date: Mon, 2 Nov 2020 18:24:15 +0000 (+0000)
Subject: vote and propose [skip ci]
X-Git-Tag: 2.4.47~244
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d38bcb709adb168553fed9d73fe9d470db1c95b8;p=thirdparty%2Fapache%2Fhttpd.git

vote and propose [skip ci]


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

diff --git a/STATUS b/STATUS
index fac2759d4bb..6c3c40eb6dc 100644
--- a/STATUS
+++ b/STATUS
@@ -243,14 +243,19 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      Backport version for 2.4.x of patch:
         https://github.com/apache/httpd/pull/142
         https://github.com/apache/httpd/pull/142.diff
-     +1: rpluem,
+     +1: rpluem, giovanni
 
   *) core: Avoid a core dump if 'AllowOverride nonfatal' is used in a configuration
      file.
      Trunk version of patch:
         https://svn.apache.org/r1881311
     Backport version for 2.4.x of patch:
-     +1: jailletc36,
+     +1: jailletc36, giovanni
+
+  *) core: Correctly strip unwanted headers on 304 response
+     Trunk version of patch:
+        http://svn.apache.org/r1881590
+        http://svn.apache.org/r1881624
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]