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

update after merge


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

diff --git a/STATUS b/STATUS
index 820d25f2380..b10bbae08df 100644
--- a/STATUS
+++ b/STATUS
@@ -153,16 +153,6 @@ 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 ]