diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2017-02-07 12:27:43 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2017-02-07 12:27:43 +0000 |
| commit | eb791a9dc94d67e5e97983a67cb0dd7b6214f3bf (patch) | |
| tree | 8ffd2e879e1212fc9c47fd35187b29e39fc81844 /usr.sbin/httpd/parse.y | |
| parent | 91c41c87581addecbc3e1552755a8b3187c9d3c2 (diff) | |
/tmp/cvsspEkok
Diffstat (limited to 'usr.sbin/httpd/parse.y')
| -rw-r--r-- | usr.sbin/httpd/parse.y | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/usr.sbin/httpd/parse.y b/usr.sbin/httpd/parse.y index 3afd9f95663..f53cfff67bf 100644 --- a/usr.sbin/httpd/parse.y +++ b/usr.sbin/httpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.88 2017/01/27 07:03:27 tom Exp $ */ +/* $OpenBSD: parse.y,v 1.89 2017/02/07 12:27:42 reyk Exp $ */ /* * Copyright (c) 2007 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -245,6 +245,8 @@ server : SERVER optmatch STRING { s->srv_conf.parent_id = s->srv_conf.id; s->srv_s = -1; s->srv_conf.timeout.tv_sec = SERVER_TIMEOUT; + s->srv_conf.requesttimeout.tv_sec = + SERVER_REQUESTTIMEOUT; s->srv_conf.maxrequests = SERVER_MAXREQUESTS; s->srv_conf.maxrequestbody = SERVER_MAXREQUESTBODY; s->srv_conf.flags = SRVFLAG_LOG; @@ -686,6 +688,10 @@ conflags : TIMEOUT timeout { memcpy(&srv_conf->timeout, &$2, sizeof(struct timeval)); } + | REQUEST TIMEOUT timeout { + memcpy(&srv_conf->requesttimeout, &$3, + sizeof(struct timeval)); + } | MAXIMUM REQUESTS NUMBER { srv_conf->maxrequests = $3; } |