From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 11 Dec 2020 15:10:40 +0000 (+0000)
Subject: Promote.
X-Git-Tag: 2.4.47~201
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e82736734d87249abe1ac374f9a948590062def;p=thirdparty%2Fapache%2Fhttpd.git

Promote.

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

diff --git a/STATUS b/STATUS
index c11a3fb97dd..f402c436d7a 100644
--- a/STATUS
+++ b/STATUS
@@ -145,6 +145,11 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     Backport version for 2.4.x of patch:
      +1: jailletc36, giovanni, ylavic
 
+  *) mod_unique_id: Use base64url encoding for UNIQUE_ID
+     trunk patch: https://svn.apache.org/r1883947
+     2.4.x patch: svn merge -c 1883947 ^/httpd/httpd/trunk .
+     +1: jorton, ylavic, covener 
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -219,11 +224,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: ylavic, covener
      ylavic: +1 with CHANGES entry
 
-  *) mod_unique_id: Use base64url encoding for UNIQUE_ID
-     trunk patch: https://svn.apache.org/r1883947
-     2.4.x patch: svn merge -c 1883947 ^/httpd/httpd/trunk .
-     +1: jorton, ylavic, covener 
-
   *) mod_proxy_http: Fix 100-continue deadlock for spooled request bodies,
      leading to Request Timeout (408). PR 63855.
      trunk patch: https://svn.apache.org/r1769760