From: Eric Covener <covener@apache.org>
Date: Fri, 14 Jul 2023 13:21:23 +0000 (+0000)
Subject: vote/promote
X-Git-Tag: 2.4.58-rc1-candidate~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8899eb09c7d8dcea0d789012b9bef67e7ee91bd;p=thirdparty%2Fapache%2Fhttpd.git

vote/promote

[skip ci]


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

diff --git a/STATUS b/STATUS
index 7597a884937..ad8c9d7ecbe 100644
--- a/STATUS
+++ b/STATUS
@@ -184,6 +184,16 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      +1: jfclere, rpluem, ylavic
      rpluem says: Does anyone know why we don't merge the server config?
 
+  *) mime.types update to sync with trunk
+     Trunk version of patch:
+        https://svn.apache.org/r1884511
+        https://svn.apache.org/r1901273
+        https://svn.apache.org/r1910843
+        https://svn.apache.org/r1910849
+     2.4.x version of patch:
+        svn merge -c 1884511,1901273,1910843,1910849 ^/httpd/httpd/trunk .
+     +1: jorton, icing, covener
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -236,16 +246,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: rpluem,
      ylavic: see https://lists.apache.org/thread/jftfd6mo6p3b0tw694rlh09gdl7189hq
 
-  *) mime.types update to sync with trunk
-     Trunk version of patch:
-        https://svn.apache.org/r1884511
-        https://svn.apache.org/r1901273
-        https://svn.apache.org/r1910843
-        https://svn.apache.org/r1910849
-     2.4.x version of patch:
-        svn merge -c 1884511,1901273,1910843,1910849 ^/httpd/httpd/trunk .
-     +1: jorton, icing, 
-
   *) mod_http2: add HTTP/2 WebSockets (RFC8441) support.
      Trunk version of patch:
         https://svn.apache.org/r1910507