diff options
Diffstat (limited to 'usr.sbin/httpd/config.c')
| -rw-r--r-- | usr.sbin/httpd/config.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.sbin/httpd/config.c b/usr.sbin/httpd/config.c index cbb2973bab5..9eb8dd801c1 100644 --- a/usr.sbin/httpd/config.c +++ b/usr.sbin/httpd/config.c @@ -1,4 +1,4 @@ -/* $OpenBSD: config.c,v 1.18 2014/08/05 15:36:59 reyk Exp $ */ +/* $OpenBSD: config.c,v 1.19 2014/08/05 18:01:10 reyk Exp $ */ /* * Copyright (c) 2011 - 2014 Reyk Floeter <reyk@openbsd.org> @@ -285,6 +285,10 @@ config_getserver_config(struct httpd *env, struct server *srv, sizeof(srv_conf->errorlog)); } + memcpy(&srv_conf->timeout, &srv->srv_conf.timeout, + sizeof(srv_conf->timeout)); + srv_conf->maxrequests = srv->srv_conf.maxrequests; + DPRINTF("%s: %s %d location \"%s\", " "parent \"%s\", flags: %s", __func__, ps->ps_title[privsep_process], ps->ps_instance, |