From: Ruediger Pluem <rpluem@apache.org>
Date: Thu, 9 Sep 2021 14:57:48 +0000 (+0000)
Subject: * Vote and promote [skip ci]
X-Git-Tag: candidate-2.4.49-rc1~1^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b88fc883644254c747fb1cdf90775c881cebc969;p=thirdparty%2Fapache%2Fhttpd.git

* Vote and promote [skip ci]

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

diff --git a/STATUS b/STATUS
index da3f4dbf958..8bc9f38c3b0 100644
--- a/STATUS
+++ b/STATUS
@@ -141,19 +141,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-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
-
   *) back port: new ap_ssl_bind_outgoing for multi ssl support in proxy connections
      core/mod_proxy/mod_ssl:
        Adding outgoing flag to conn_rec, indicating a connection is
@@ -170,11 +157,20 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      trunk patch: http://svn.apache.org/r1890605
      2.4.x patch: https://github.com/apache/httpd/pull/203.diff
            PR: https://github.com/apache/httpd/pull/203
-     +1: icing, minfrin
-     rpluem says: I made comments on https://github.com/apache/httpd/pull/203,
-     but I cannot find them commented. Further more the PR currently has merge
-     conflicts.
-     icing says: conflicts resolved, comments commented.
+     +1: icing, minfrin, rpluem
+
+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
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]