From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 30 Jun 2020 12:50:38 +0000 (+0000)
Subject: Vote + promote [skip ci].
X-Git-Tag: 2.4.44~57
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f48d87b802909ab2ed8b997db481d7afcee6664;p=thirdparty%2Fapache%2Fhttpd.git

Vote + promote [skip ci].

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

diff --git a/STATUS b/STATUS
index f422ec76967..bad46539699 100644
--- a/STATUS
+++ b/STATUS
@@ -171,6 +171,14 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1877829,1877830 ^/httpd/httpd/trunk .
     +1: covener, ylavic, rpluem
 
+  *) Replace apr_psprintf with apr_pstrcat where the format strings only
+     contain %s to improve efficiency. Leave out error messages as they
+     are not on a crtical code path and error message become less readable
+     when taking out the format specifiers.
+     trunk patch: http://svn.apache.org/1862270
+     2.4.x patch: svn merge -c 1862270 ^/httpd/httpd/trunk .
+     +1: minfrin, rpluem, ylavic
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -233,15 +241,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      jailletc36: CHANGES could also be looked at if it makes sense to update the terminology
                  also here
 
-  *) Replace apr_psprintf with apr_pstrcat where the format strings only
-     contain %s to improve efficiency. Leave out error messages as they
-     are not on a crtical code path and error message become less readable
-     when taking out the format specifiers.
-     trunk patch: http://svn.apache.org/1862270
-     2.4.x patch: svn merge -c 1862270 ^/httpd/httpd/trunk .
-     +1: minfrin, rpluem
-
-
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]