diff options
| author | Reyk Floeter <reyk@esdenera.com> | 2015-03-19 17:34:21 +0100 |
|---|---|---|
| committer | Reyk Floeter <reyk@esdenera.com> | 2015-03-19 17:34:21 +0100 |
| commit | 89b8c998b9e87423cc1cdec8603294765f6a0332 (patch) | |
| tree | 8a278467f0ac4d9d9d38bc9132b21c78430c229d | |
| parent | 9420295b964fcd0159cd17f7c115d6ceb2af400a (diff) | |
| download | httpd-89b8c998b9e87423cc1cdec8603294765f6a0332.tar.gz httpd-89b8c998b9e87423cc1cdec8603294765f6a0332.zip | |
sync
| -rw-r--r-- | httpd/httpd.conf.5 | 8 | ||||
| -rw-r--r-- | httpd/httpd.h | 3 | ||||
| -rw-r--r-- | httpd/server.c | 8 |
3 files changed, 9 insertions, 10 deletions
diff --git a/httpd/httpd.conf.5 b/httpd/httpd.conf.5 index 3e815b9..578e490 100644 --- a/httpd/httpd.conf.5 +++ b/httpd/httpd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: httpd.conf.5,v 1.55 2015/03/09 15:51:17 reyk Exp $ +.\" $OpenBSD: httpd.conf.5,v 1.56 2015/03/11 21:52:20 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: March 9 2015 $ +.Dd $Mdocdate: March 11 2015 $ .Dt HTTPD.CONF 5 .Os .Sh NAME @@ -515,8 +515,8 @@ server "www.example.com" { } .Ed .Pp -The syntax of the types section is also compatible with the format used by nginx, -so it is possible to include its +The syntax of the types section is also compatible with the format +used by nginx, so it is possible to include its .Pa mime.types file directly: .Bd -literal -offset indent diff --git a/httpd/httpd.h b/httpd/httpd.h index 28e02a5..50f300a 100644 --- a/httpd/httpd.h +++ b/httpd/httpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: httpd.h,v 1.81 2015/02/23 18:43:18 reyk Exp $ */ +/* $OpenBSD: httpd.h,v 1.82 2015/03/15 22:08:45 florian Exp $ */ /* * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -530,7 +530,6 @@ int server_bufferevent_write_chunk(struct client *, struct evbuffer *, size_t); int server_bufferevent_add(struct event *, int); int server_bufferevent_write(struct client *, void *, size_t); -void server_inflight_dec(struct client *, const char *); struct server * server_byaddr(struct sockaddr *, in_port_t); struct server_config * diff --git a/httpd/server.c b/httpd/server.c index 813f945..281d3ee 100644 --- a/httpd/server.c +++ b/httpd/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.60 2015/02/23 09:52:28 reyk Exp $ */ +/* $OpenBSD: server.c,v 1.61 2015/03/15 22:08:45 florian Exp $ */ /* * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -66,6 +66,7 @@ void server_tls_writecb(int, short, void *); void server_accept(int, short, void *); void server_accept_tls(int, short, void *); void server_input(struct client *); +void server_inflight_dec(struct client *, const char *); extern void bufferevent_read_pressure_cb(struct evbuffer *, size_t, size_t, void *); @@ -918,13 +919,12 @@ server_accept(int fd, short event, void *arg) err: if (s != -1) { close(s); - if (clt != NULL) - free(clt); + free(clt); /* * the client struct was not completly set up, but still * counted as an inflight client. account for this. */ - server_inflight_dec(clt, __func__); + server_inflight_dec(NULL, __func__); } } |