diff options
author | Reyk Floeter <reyk@esdenera.com> | 2015-05-15 20:13:20 +0200 |
---|---|---|
committer | Reyk Floeter <reyk@esdenera.com> | 2015-05-15 20:13:20 +0200 |
commit | fbefc9a818a5ed612c0df918598057a8b551cb95 (patch) | |
tree | c072ec2d257394bb11fb1c75f43d040059245c4e /httpd/parse.y | |
parent | 89b8c998b9e87423cc1cdec8603294765f6a0332 (diff) | |
download | httpd-fbefc9a818a5ed612c0df918598057a8b551cb95.tar.gz httpd-fbefc9a818a5ed612c0df918598057a8b551cb95.zip |
sync
Diffstat (limited to 'httpd/parse.y')
-rw-r--r-- | httpd/parse.y | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/httpd/parse.y b/httpd/parse.y index 50e51ab..0aae421 100644 --- a/httpd/parse.y +++ b/httpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.66 2015/03/09 15:46:45 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.67 2015/04/01 04:51:15 jsg Exp $ */ /* * Copyright (c) 2007 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -1907,6 +1907,8 @@ server_inherit(struct server *src, const char *name, fatal("out of memory"); dst->srv_conf.tls_cert = NULL; dst->srv_conf.tls_key = NULL; + dst->srv_conf.tls_cert_len = 0; + dst->srv_conf.tls_key_len = 0; if (src->srv_conf.return_uri != NULL && (dst->srv_conf.return_uri = |