Commit 929df94d authored by Eric Covener's avatar Eric Covener
Browse files

fix StrictHostCheck in single/non-NVH vhosts 

While all VH'es are NVH'es in 2.4 and later, something special happens
once a second NVH in a set is added.  This case covers the 
global server config scenario as well.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1840229 13f79535-47bb-0310-9956-ffa450edef68
parent 712126f9

server/vhost.c

+3 −3
Changes for server/vhost.c: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -1060,9 +1060,9 @@ static int update_server_from_aliases(request_rec *r) 
        goto found;

    }



    if (r->server == ap_server_conf) { 

        if (matches_aliases(ap_server_conf, host)) {

            s = ap_server_conf;

    if (!r->connection->vhost_lookup_data) { 

        if (matches_aliases(r->server, host)) {

            s = r->server;

            goto found;

        }

    }