From: Ruediger Pluem <rpluem@apache.org>
Date: Wed, 5 May 2021 07:36:37 +0000 (+0000)
Subject: * Promote [skip ci]
X-Git-Tag: 2.4.48~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf1e1aea9a6b1491b8cdd1a0675a61631db3af3a;p=thirdparty%2Fapache%2Fhttpd.git

* Promote [skip ci]

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

diff --git a/STATUS b/STATUS
index 6d67d027e49..6866eb2240f 100644
--- a/STATUS
+++ b/STATUS
@@ -141,6 +141,11 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_socache_shmcb: be safe from socache_shmcb_destroy() late call.  PR 59798
+     trunk patch: http://svn.apache.org/r1888266
+     2.4.x patch: svn merge -c 1888266 ^/httpd/httpd/trunk .
+     +1: ylavic, icing, rpluem
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -175,11 +180,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              backport..
     jailletc36: pull/179 has been updated with r1889009
 
-  *) mod_socache_shmcb: be safe from socache_shmcb_destroy() late call.  PR 59798
-     trunk patch: http://svn.apache.org/r1888266
-     2.4.x patch: svn merge -c 1888266 ^/httpd/httpd/trunk .
-     +1: ylavic, icing, rpluem
-
   *) 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 .