diff options
author | Reyk Floeter <reyk@esdenera.com> | 2015-01-03 16:54:52 +0100 |
---|---|---|
committer | Reyk Floeter <reyk@esdenera.com> | 2015-01-03 16:54:52 +0100 |
commit | 461ae7b2ed14e4c38ecf78d791138922a6c050f3 (patch) | |
tree | bd2ae2b8b4e978e929b5b507a3ddaa0b5d3fa311 | |
parent | 311a75186cb09ce91bbb34f71ddbf282b420fd21 (diff) | |
download | httpd-461ae7b2ed14e4c38ecf78d791138922a6c050f3.tar.gz httpd-461ae7b2ed14e4c38ecf78d791138922a6c050f3.zip |
sync with -current
-rw-r--r-- | TODO.md | 16 | ||||
-rw-r--r-- | config.c | 2 | ||||
-rw-r--r-- | httpd.conf.5 | 4 | ||||
-rw-r--r-- | parse.y | 2 |
4 files changed, 19 insertions, 5 deletions
@@ -30,9 +30,23 @@ is to set a non-accessible root: root "/forbidden" } -#20150102-04 server aliases **PENDING** +#20150102-04 server aliases **CLOSED** --------------------------------------- +Update: server aliases and multiple listen statements are supported: + +> Support alias names and multiple listen statements per server block. +The implementation is done in the parser by expanding each +alias/listen into an independent server configuration; this makes it +easier to handle internally without adding additional loops or +conditions. + + server "www.example.com" { + alias "example.com" + listen on * port 80 + listen on * tls port 443 + } + Server aliases and a few restrictions of the grammar: Individual server blocks can currently only have one name and listen statement. This will be fixed in the parser later. To avoid too much repeating @@ -1,4 +1,4 @@ -/* $OpenBSD: config.c,v 1.26 2014/12/21 00:54:49 guenther Exp $ */ +/* $OpenBSD: config.c,v 1.27 2015/01/03 15:49:18 reyk Exp $ */ /* * Copyright (c) 2011 - 2014 Reyk Floeter <reyk@openbsd.org> diff --git a/httpd.conf.5 b/httpd.conf.5 index 275f48b..ff0152a 100644 --- a/httpd.conf.5 +++ b/httpd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: httpd.conf.5,v 1.40 2014/12/28 13:53:23 reyk Exp $ +.\" $OpenBSD: httpd.conf.5,v 1.41 2015/01/03 15:49:18 reyk Exp $ .\" .\" Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: December 28 2014 $ +.Dd $Mdocdate: January 3 2015 $ .Dt HTTPD.CONF 5 .Os .Sh NAME @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.46 2014/12/21 00:54:49 guenther Exp $ */ +/* $OpenBSD: parse.y,v 1.47 2015/01/03 15:49:18 reyk Exp $ */ /* * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org> |