aboutsummaryrefslogtreecommitdiff
path: root/httpd/config.c
diff options
context:
space:
mode:
authorReyk Floeter <reyk@esdenera.com>2015-08-03 17:26:57 +0200
committerReyk Floeter <reyk@esdenera.com>2015-08-03 17:26:57 +0200
commit72eaa1034c4612f84cd4ffa39a8d1ddf63a5479f (patch)
treedf4fcdd89abdf900b51471a8388a363577979bc4 /httpd/config.c
parentc9b8164b7e7a829fc6e80c5879a5ba7e7448a3fb (diff)
downloadhttpd-72eaa1034c4612f84cd4ffa39a8d1ddf63a5479f.tar.gz
httpd-72eaa1034c4612f84cd4ffa39a8d1ddf63a5479f.zip
sync
Diffstat (limited to 'httpd/config.c')
-rw-r--r--httpd/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/httpd/config.c b/httpd/config.c
index 2829bed..15560ed 100644
--- a/httpd/config.c
+++ b/httpd/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.41 2015/07/18 06:00:43 reyk Exp $ */
+/* $OpenBSD: config.c,v 1.42 2015/07/19 05:17:27 reyk Exp $ */
/*
* Copyright (c) 2011 - 2015 Reyk Floeter <reyk@openbsd.org>
@@ -446,7 +446,7 @@ config_getserver_config(struct httpd *env, struct server *srv,
f = SRVFLAG_SERVER_HSTS;
srv_conf->flags |= parent->flags & f;
srv_conf->hsts_max_age = parent->hsts_max_age;
- srv_conf->hsts_subdomains = parent->hsts_subdomains;
+ srv_conf->hsts_flags = parent->hsts_flags;
memcpy(&srv_conf->timeout, &parent->timeout,
sizeof(srv_conf->timeout));