From: Graham Leggett <minfrin@apache.org>
Date: Sat, 16 Jan 2021 13:26:45 +0000 (+0000)
Subject: Vote, then promote.
X-Git-Tag: 2.4.47~163
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0223ceffa13487d565c40107241aee916ca157d7;p=thirdparty%2Fapache%2Fhttpd.git

Vote, then promote.


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

diff --git a/STATUS b/STATUS
index dc7b0b19221..e20d3ed7d0e 100644
--- a/STATUS
+++ b/STATUS
@@ -138,6 +138,13 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) core: Correctly strip unwanted headers on 304 response
+     Trunk version of patch:
+        http://svn.apache.org/r1881590
+        http://svn.apache.org/r1881624
+     +1: ylavic, covener, minfrin
+
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -209,8 +216,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      Trunk version of patch:
         http://svn.apache.org/r1881590
         http://svn.apache.org/r1881624
-     +1: ylavic, covener
-     ylavic: +1 with CHANGES entry
+     +1: ylavic, covener, minfrin
 
   [ start of series (staged/cumulative patches) ]
   *) mod_proxy_http: Fix 100-continue deadlock for spooled request bodies. BZ 63855.