Commit d0498414 authored by Eric Covener's avatar Eric Covener
Browse files

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
parent fbbf500c

CHANGES

+4 −0
Original line number Diff line number Diff line 
                                                         -*- 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.

server/vhost.c

+1 −1
Original line number Diff line number Diff line
@@ -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] == '.') {