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

vote/promote

[skip ci]


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

diff --git a/STATUS b/STATUS
index e3e638ee544..98b08bae41f 100644
--- a/STATUS
+++ b/STATUS
@@ -193,6 +193,15 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      +1: jfclere, rpluem, ylavic
      rpluem says: Does anyone know why we don't merge the server config?
 
+  *) mod_http2: Fix memory leak in calc_sha256_hash().
+     Trunk version of patch:
+        https://svn.apache.org/r1908502
+     Backport version for 2.4.x of patch:
+      Trunk version of patch works
+      svn merge -c 1908502 ^/httpd/httpd/trunk .
+     +1: icing, jorton, covener
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -245,15 +254,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: rpluem,
      ylavic: see https://lists.apache.org/thread/jftfd6mo6p3b0tw694rlh09gdl7189hq
 
-  *) mod_http2: Fix memory leak in calc_sha256_hash().
-     Trunk version of patch:
-        https://svn.apache.org/r1908502
-     Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1908502 ^/httpd/httpd/trunk .
-     +1: icing, jorton, 
-
-    *) mod_rewrite: PR66672 trailing ? and QSA together regression
+  *) mod_rewrite: PR66672 trailing ? and QSA together regression
       Trunk version of patch:
           svn diff -r  1910649:1910705 modules/mappers/mod_rewrite.c
       Backport version for 2.4.x of patch:
@@ -269,14 +270,14 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        trunk version of patch works w/o CHANGES
        svn merge -c 1878890 ^/httpd/httpd/trunk .
        or https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/370.patch
-     +1: jorton,
+     +1: jorton, covener
 
   *) mod_rewrite: Fix possible NULL pointer dereference in hook_uri2file
      Trunk version of patch:
        https://svn.apache.org/r1910815 
      2.4.x version of patch:
        svn merge -c 1910815 ^/httpd/httpd/trunk .
-     +1: jorton, 
+     +1: jorton, covener
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]