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 98b34cadb6e36692d8d73a030ae3654101285fb3..5b1d8742c5e63405f82a558cfff94fc2c5e57d2b 100644 (file)
--- 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;
         }
     }