From: Eric Covener <covener@apache.org>
Date: Mon, 2 Jul 2018 20:49:02 +0000 (+0000)
Subject: backported
X-Git-Tag: 2.4.34~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09bc51cf159bf7c674f58957a7902bec50f12993;p=apache

backported



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

diff --git a/STATUS b/STATUS
index 872f0f4b52..245232aedb 100644
--- 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 .