From: Christophe Jaillet <jailletc36@apache.org>
Date: Mon, 13 Dec 2021 20:44:43 +0000 (+0000)
Subject: Update proposal.
X-Git-Tag: candidate-2.4.52-rc1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2581fa1f139d9bf07581363299d5aeac53a3799;p=thirdparty%2Fapache%2Fhttpd.git

Update proposal.

Note for me: always try building before submitting. It is not because a
patch looks trivial and applies cleanly, that it builds  :(

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

diff --git a/STATUS b/STATUS
index 643f8f0c702..4cb51b0efb1 100644
--- a/STATUS
+++ b/STATUS
@@ -150,19 +150,16 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
   *) Easy backports:
-     - mod_deflate: be explicit when setting c->etag_opt = AP_DEFLATE_ETAG_ADDSUFFIX
      - mod_proxy_balancer: add missing spaces in HTML output
      - mod_proxy_http: Avoid a double call to apr_table_get()
      - mod_ssl: Fix some typo and doxygen issues
-     trunk patch: http://svn.apache.org/r1586543
-                  http://svn.apache.org/r1889494
+     trunk patch: http://svn.apache.org/r1889494
                   http://svn.apache.org/r1892563
                   http://svn.apache.org/r1892917
-     2.4.x patch: svn merge -c 1586543,1889494,1892563,1892917 ^/httpd/httpd/trunk .
+     2.4.x patch: svn merge -c 1889494,1892563,1892917 ^/httpd/httpd/trunk .
      +1: jailletc36, 
-     rpluem: r1586543 requires r1586542 backported first and should possiblyi
-     backported together with it. The other three revisions look fine.
-     minfrin: Tried r1586542 but got conflicts. Other revs were fine.
+     rpluem: The other three revisions look fine.
+     minfrin: Other revs were fine.
 
 
 PATCHES/ISSUES THAT ARE BEING WORKED