From: Ruediger Pluem <rpluem@apache.org>
Date: Tue, 4 May 2021 09:04:51 +0000 (+0000)
Subject: * Propose
X-Git-Tag: 2.4.48~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dfaabe4abae42963ca53212c7afbab8c62eecb1c;p=thirdparty%2Fapache%2Fhttpd.git

* Propose

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

diff --git a/STATUS b/STATUS
index cb40b572922..5af2d7f57a3 100644
--- a/STATUS
+++ b/STATUS
@@ -189,12 +189,22 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      and other alternatives have been discussed in PR 64339.  If r1884505
      is not the right fix, then it should be removed from trunk.
      Putting it here is a way to revive the discussion
-                  
+
   *) mod_http2: fix incomplete sync with github and its version number.
      trunk patch: http://svn.apache.org/r1889119
      2.4.x patch: svn merge -c 1889119 ^/httpd/httpd/trunk .
      +1: icing
 
+  *) core: Fix a regression that stripped the ETag header from 304 responses.
+     PR 61820
+     Trunk version of patch:
+        https://svn.apache.org/r1889341
+     Backport version for 2.4.x of patch:
+      Trunk version of patch works
+      svn merge -c 1889341 ^/httpd/httpd/trunk .
+     +1: rpluem,
+
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]