From: Eric Covener <covener@apache.org>
Date: Thu, 6 Sep 2018 15:24:29 +0000 (+0000)
Subject: fix StrictHostCheck in single/non-NVH vhosts
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2350
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d3ea26e33216b68fc09d520349cdc2d07fb2972;p=thirdparty%2Fapache%2Fhttpd.git

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

diff --git a/server/vhost.c b/server/vhost.c
index 98b34cadb6e..5b1d8742c5e 100644
--- a/server/vhost.c
+++ b/server/vhost.c
@@ -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;
         }
     }