From: Eric Covener <covener@apache.org>
Date: Mon, 2 Jul 2018 20:47:00 +0000 (+0000)
Subject: Merge r1834318 from trunk:
X-Git-Tag: 2.4.34~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df975e729f554bdc32aad1d8aee8b93cb147a111;p=apache

Merge r1834318 from trunk:

Re-allow '_' (underscore) in hostnames.

'_' was not permitted in hostnames since 2.4.25's "HTTP Strict"
changes.




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

diff --git a/CHANGES b/CHANGES
index bb78a140ee..0b5817e316 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.34
+
+  *) core: Re-allow '_' (underscore) in hostnames.
+     [Eric Covener]
+
   *) mod_authz_core: If several parameters are used in a AuthzProviderAlias
      directive, if these parameters are not enclosed in quotation mark, only
      the first one is handled. The other ones are silently ignored.
diff --git a/server/vhost.c b/server/vhost.c
index 5ad4efd381..b23b2dd317 100644
--- a/server/vhost.c
+++ b/server/vhost.c
@@ -757,7 +757,7 @@ static apr_status_t strict_hostname_check(request_rec *r, char *host)
     int is_dotted_decimal = 1, leading_zeroes = 0, dots = 0;
 
     for (ch = host; *ch; ch++) {
-        if (apr_isalpha(*ch) || *ch == '-') {
+        if (apr_isalpha(*ch) || *ch == '-' || *ch == '_') {
             is_dotted_decimal = 0;
         }
         else if (ch[0] == '.') {