From: Stefan Eissing <icing@apache.org>
Date: Mon, 24 Jun 2024 12:30:27 +0000 (+0000)
Subject: vote and promote
X-Git-Tag: 2.4.60-rc1-candidate~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=116171d56a3c71125dc9ecf9d74f3da98dccdd5b;p=thirdparty%2Fapache%2Fhttpd.git

vote and promote


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

diff --git a/STATUS b/STATUS
index 32ac0bf0282..820d25f2380 100644
--- a/STATUS
+++ b/STATUS
@@ -153,6 +153,15 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   *) core: Add support for IPv6 link-local addresses with APR 1.7+
+      Trunk version of patch:
+         https://svn.apache.org/r1816609
+         https://svn.apache.org/r1818030
+      Backport version for 2.4.x of patch:
+         https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/440.patch
+      PR: https://github.com/apache/httpd/pull/440
+      +1: jorton, ylavic, icing
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -198,15 +207,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: svn merge -c 1916004  ^/httpd/httpd/trunk .
       +1: jfclere,
 
-   *) core: Add support for IPv6 link-local addresses with APR 1.7+
-      Trunk version of patch: 
-         https://svn.apache.org/r1816609
-         https://svn.apache.org/r1818030
-      Backport version for 2.4.x of patch:
-         https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/440.patch
-      PR: https://github.com/apache/httpd/pull/440
-      +1: jorton, ylavic, 
-
   *) mod_proxy: Fix DNS requests and connections closed before the
      configured addressTTL.  BZ 69126.
      trunk patch: http://svn.apache.org/r1918228