diff options
| author | Reyk Floeter <reyk@esdenera.com> | 2015-02-07 02:23:49 +0100 |
|---|---|---|
| committer | Reyk Floeter <reyk@esdenera.com> | 2015-02-07 02:23:49 +0100 |
| commit | f45dee2d699f0dceaf4794468cd653b45a9ecdb3 (patch) | |
| tree | b538ef4fba281641ff8f3d5db653d8eb53aa8a5f | |
| parent | 2496a64b6cf81b3e41295a1904649e3eb40bd654 (diff) | |
| download | httpd-f45dee2d699f0dceaf4794468cd653b45a9ecdb3.tar.gz httpd-f45dee2d699f0dceaf4794468cd653b45a9ecdb3.zip | |
sync with -current
| -rw-r--r-- | config.c | 2 | ||||
| -rw-r--r-- | httpd.conf.5 | 4 | ||||
| -rw-r--r-- | httpd.h | 2 | ||||
| -rw-r--r-- | parse.y | 8 | ||||
| -rw-r--r-- | server.c | 2 | ||||
| -rw-r--r-- | server_http.c | 2 |
6 files changed, 10 insertions, 10 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: config.c,v 1.33 2015/02/05 10:46:17 reyk Exp $ */ +/* $OpenBSD: config.c,v 1.34 2015/02/07 01:23:12 reyk Exp $ */ /* * Copyright (c) 2011 - 2015 Reyk Floeter <reyk@openbsd.org> diff --git a/httpd.conf.5 b/httpd.conf.5 index 6db62e8..d5afe6d 100644 --- a/httpd.conf.5 +++ b/httpd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: httpd.conf.5,v 1.47 2015/01/19 19:37:50 reyk Exp $ +.\" $OpenBSD: httpd.conf.5,v 1.48 2015/02/07 01:23:12 reyk Exp $ .\" .\" Copyright (c) 2014, 2015 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: January 19 2015 $ +.Dd $Mdocdate: February 7 2015 $ .Dt HTTPD.CONF 5 .Os .Sh NAME @@ -1,4 +1,4 @@ -/* $OpenBSD: httpd.h,v 1.73 2015/01/21 22:23:24 reyk Exp $ */ +/* $OpenBSD: httpd.h,v 1.75 2015/02/07 01:23:12 reyk Exp $ */ /* * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.59 2015/01/29 08:52:52 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.61 2015/02/07 01:23:12 reyk Exp $ */ /* * Copyright (c) 2007 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -1850,7 +1850,6 @@ server_inherit(struct server *src, const char *name, /* Copy the source server and assign a new Id */ memcpy(&dst->srv_conf, &src->srv_conf, sizeof(dst->srv_conf)); - if ((dst->srv_conf.tls_cert_file = strdup(src->srv_conf.tls_cert_file)) == NULL) fatal("out of memory"); @@ -1918,7 +1917,7 @@ server_inherit(struct server *src, const char *name, /* Copy all the locations of the source server */ TAILQ_FOREACH(s, conf->sc_servers, srv_entry) { if (!(s->srv_conf.flags & SRVFLAG_LOCATION && - s->srv_conf.id == src->srv_conf.id)) + s->srv_conf.parent_id == src->srv_conf.parent_id)) continue; if ((dstl = calloc(1, sizeof(*dstl))) == NULL) @@ -1928,7 +1927,8 @@ server_inherit(struct server *src, const char *name, strlcpy(dstl->srv_conf.name, name, sizeof(dstl->srv_conf.name)); /* Copy the new Id and listen address */ - dstl->srv_conf.id = dst->srv_conf.id; + dstl->srv_conf.id = ++last_server_id; + dstl->srv_conf.parent_id = dst->srv_conf.id; memcpy(&dstl->srv_conf.ss, &addr->ss, sizeof(dstl->srv_conf.ss)); dstl->srv_conf.port = addr->port; @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.54 2015/01/21 22:21:05 reyk Exp $ */ +/* $OpenBSD: server.c,v 1.55 2015/02/07 01:23:12 reyk Exp $ */ /* * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> diff --git a/server_http.c b/server_http.c index f7990b0..d5acb05 100644 --- a/server_http.c +++ b/server_http.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server_http.c,v 1.70 2015/02/05 10:47:53 reyk Exp $ */ +/* $OpenBSD: server_http.c,v 1.72 2015/02/07 01:23:12 reyk Exp $ */ /* * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> |