From: Joe Orton <jorton@apache.org>
Date: Mon, 13 Dec 2021 16:12:13 +0000 (+0000)
Subject: Propose one, defer one. [skip ci]
X-Git-Tag: candidate-2.4.52-rc1~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85e51f0d47ae4e0b23b8c6b8ac37d904e8de5704;p=thirdparty%2Fapache%2Fhttpd.git

Propose one, defer one. [skip ci]


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

diff --git a/STATUS b/STATUS
index 3dc0e4fb987..51d4a9f60a8 100644
--- a/STATUS
+++ b/STATUS
@@ -150,16 +150,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
-  *) mod_xml2enc: Correctly handle Microsoft OOXML documents.  PR 64339
-     trunk patch: http://svn.apache.org/r1884505
-     2.4.x patch: svn merge -c 1884505 ^/httpd/httpd/trunk .
-     +1: 
-     jailletc36: there has been some discussion about how to fix the issue.
-     I'm not sure that the commit above is the best solution
-     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
-
   *) Easy backports:
      - mod_deflate: be explicit when setting c->etag_opt = AP_DEFLATE_ETAG_ADDSUFFIX
      - mod_proxy_balancer: add missing spaces in HTML output
@@ -175,10 +165,25 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      backported together with it. The other three revisions look fine.
      minfrin: Tried r1586542 but got conflicts. Other revs were fine.
 
+  *) OpenSSL autoconf detection improvement
+     trunk patch: http://svn.apache.org/r1834497
+     2.4.x patch: svn merge -c 1834497 ^/httpd/httpd/trunk .
+     +1: jorton,
+
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]
 
+  *) mod_xml2enc: Correctly handle Microsoft OOXML documents.  PR 64339
+     trunk patch: http://svn.apache.org/r1884505
+     2.4.x patch: svn merge -c 1884505 ^/httpd/httpd/trunk .
+     +1: 
+     jailletc36: there has been some discussion about how to fix the issue.
+     I'm not sure that the commit above is the best solution
+     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: sync with trunk
      - Fixed an issue since 1.15.24 that "Server" headers in proxied requests
        were overwritten instead of preserved. [PR by @daum3ns]