]> granicus.if.org Git - apache/commitdiff
backported
authorEric Covener <covener@apache.org>
Mon, 2 Jul 2018 20:49:02 +0000 (20:49 +0000)
committerEric Covener <covener@apache.org>
Mon, 2 Jul 2018 20:49:02 +0000 (20:49 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834896 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 872f0f4b525a8370d359b414bea423cb827a1c9a..245232aedbd5b385ef316ec46d36f83a90cef8f1 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -124,12 +124,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) core: re-allow '_' in hostnames (by default)
-     trunk patch: http://svn.apache.org/r1834318
-     2.4.x patch: svn merge -c 1834318 ^/httpd/httpd/trunk .
-               + t/tests/http_strict.t update after committed
-     +1 covener, jim, ylavic
-
   *) mod_ratelimit: fix behavior with proxied content
      trunk patch: http://svn.apache.org/r1833875
      2.4.x patch: svn merge -c 1833875 ^/httpd/httpd/trunk .