diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2014-09-04 13:45:18 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2014-09-04 13:45:18 +0000 |
| commit | c01ce3cd7ce1db63f3f26f455ca0df843596fb04 (patch) | |
| tree | 0094805d8b1d1c95c8e01dcbbe64d49933188181 /usr.sbin | |
| parent | d90385fc711f16e5cf06fa25f96402a95f795664 (diff) | |
One line change adding the 'include' directive to the valid server
options. This allows to include external configuration files from
within server and location sections, not just from global context, for
example to share common configuration within multiple servers (or
virtual hosts).
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/httpd/parse.y | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/httpd/parse.y b/usr.sbin/httpd/parse.y index 44cf90c68c9..02c75d5c131 100644 --- a/usr.sbin/httpd/parse.y +++ b/usr.sbin/httpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.36 2014/08/25 14:27:54 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.37 2014/09/04 13:45:17 reyk Exp $ */ /* * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org> @@ -423,6 +423,7 @@ serveroptsl : LISTEN ON STRING optssl port { srv_conf = &parentsrv->srv_conf; parentsrv = NULL; } + | include ; fastcgi : NO FCGI { |