aboutsummaryrefslogtreecommitdiff
path: root/httpd/parse.y
diff options
context:
space:
mode:
Diffstat (limited to 'httpd/parse.y')
-rw-r--r--httpd/parse.y6
1 files changed, 4 insertions, 2 deletions
diff --git a/httpd/parse.y b/httpd/parse.y
index 1ba5cf3..0870819 100644
--- a/httpd/parse.y
+++ b/httpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.68 2015/06/23 15:23:14 reyk Exp $ */
+/* $OpenBSD: parse.y,v 1.70 2015/07/16 19:05:28 reyk Exp $ */
/*
* Copyright (c) 2007 - 2015 Reyk Floeter <reyk@openbsd.org>
@@ -408,7 +408,9 @@ serveroptsl : LISTEN ON STRING opttls port {
if (alias != NULL) {
/* IP-based; use name match flags from parent */
- alias->flags = srv->srv_conf.flags;
+ alias->flags &= ~SRVFLAG_SERVER_MATCH;
+ alias->flags |= srv->srv_conf.flags &
+ SRVFLAG_SERVER_MATCH;
TAILQ_INSERT_TAIL(&srv->srv_hosts,
alias, entry);
}