diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2016-09-01 10:59:39 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2016-09-01 10:59:39 +0000 |
| commit | b397722de955f37776f9cb0b0930373e071b4612 (patch) | |
| tree | e61535ced5f53bbfa0a4aef905e12bb20bb42e74 | |
| parent | d52fe478b59752c8c312b8e223c319d01f456e13 (diff) | |
spacing
| -rw-r--r-- | usr.sbin/httpd/control.c | 5 | ||||
| -rw-r--r-- | usr.sbin/httpd/httpd.h | 5 | ||||
| -rw-r--r-- | usr.sbin/httpd/logger.c | 6 | ||||
| -rw-r--r-- | usr.sbin/httpd/proc.c | 5 | ||||
| -rw-r--r-- | usr.sbin/httpd/server_fcgi.c | 4 |
5 files changed, 14 insertions, 11 deletions
diff --git a/usr.sbin/httpd/control.c b/usr.sbin/httpd/control.c index e811922cda8..153e9290a3c 100644 --- a/usr.sbin/httpd/control.c +++ b/usr.sbin/httpd/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.10 2016/08/27 11:13:16 rzalamena Exp $ */ +/* $OpenBSD: control.c,v 1.11 2016/09/01 10:59:38 reyk Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -273,7 +273,8 @@ control_dispatch_imsg(int fd, short event, void *arg) "client requested notify more than once", __func__); imsg_compose_event(&c->iev, IMSG_CTL_FAIL, - 0, env->sc_ps->ps_instance + 1, -1, NULL, 0); + 0, env->sc_ps->ps_instance + 1, -1, + NULL, 0); break; } c->flags |= CTL_CONN_NOTIFY; diff --git a/usr.sbin/httpd/httpd.h b/usr.sbin/httpd/httpd.h index efed85d0c8a..be49ed12cac 100644 --- a/usr.sbin/httpd/httpd.h +++ b/usr.sbin/httpd/httpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: httpd.h,v 1.115 2016/09/01 09:47:03 rzalamena Exp $ */ +/* $OpenBSD: httpd.h,v 1.116 2016/09/01 10:59:38 reyk Exp $ */ /* * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -700,7 +700,8 @@ __dead void fatalx(const char *, ...) /* proc.c */ enum privsep_procid proc_getid(struct privsep_proc *, unsigned int, const char *); -void proc_init(struct privsep *, struct privsep_proc *, unsigned int, int, char **); +void proc_init(struct privsep *, struct privsep_proc *, unsigned int, + int, char **); void proc_kill(struct privsep *); void proc_connect(struct privsep *); void proc_dispatch(int, short event, void *); diff --git a/usr.sbin/httpd/logger.c b/usr.sbin/httpd/logger.c index 089ee4323b5..6d469b24865 100644 --- a/usr.sbin/httpd/logger.c +++ b/usr.sbin/httpd/logger.c @@ -1,4 +1,4 @@ -/* $OpenBSD: logger.c,v 1.19 2016/08/30 14:31:53 rzalamena Exp $ */ +/* $OpenBSD: logger.c,v 1.20 2016/09/01 10:59:38 reyk Exp $ */ /* * Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org> @@ -184,8 +184,8 @@ logger_open_priv(struct imsg *imsg) return (-1); } - proc_compose_imsg(httpd_env->sc_ps, PROC_LOGGER, -1, IMSG_LOG_OPEN, -1, fd, - &id, sizeof(id)); + proc_compose_imsg(httpd_env->sc_ps, PROC_LOGGER, -1, + IMSG_LOG_OPEN, -1, fd, &id, sizeof(id)); DPRINTF("%s: opened log file %s, fd %d", __func__, path, fd); diff --git a/usr.sbin/httpd/proc.c b/usr.sbin/httpd/proc.c index 6fea129e5d5..7fb0394859f 100644 --- a/usr.sbin/httpd/proc.c +++ b/usr.sbin/httpd/proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.c,v 1.21 2016/09/01 10:57:03 reyk Exp $ */ +/* $OpenBSD: proc.c,v 1.22 2016/09/01 10:59:38 reyk Exp $ */ /* * Copyright (c) 2010 - 2014 Reyk Floeter <reyk@openbsd.org> @@ -216,7 +216,8 @@ proc_connect(struct privsep *ps) } void -proc_listento(struct privsep *ps, int fd, enum privsep_procid dst, unsigned int n) +proc_listento(struct privsep *ps, int fd, enum privsep_procid dst, + unsigned int n) { struct privsep_pipes *pp = ps->ps_pp; struct imsgev *iev; diff --git a/usr.sbin/httpd/server_fcgi.c b/usr.sbin/httpd/server_fcgi.c index a59a4029223..8a8d06682c2 100644 --- a/usr.sbin/httpd/server_fcgi.c +++ b/usr.sbin/httpd/server_fcgi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server_fcgi.c,v 1.69 2016/08/30 10:54:42 florian Exp $ */ +/* $OpenBSD: server_fcgi.c,v 1.70 2016/09/01 10:59:38 reyk Exp $ */ /* * Copyright (c) 2014 Florian Obser <florian@openbsd.org> @@ -553,7 +553,7 @@ server_fcgi_read(struct bufferevent *bev, void *arg) case FCGI_STDOUT: ++clt->clt_chunk; if (!clt->clt_fcgi_headersdone) { - clt->clt_fcgi_headersdone = + clt->clt_fcgi_headersdone = server_fcgi_getheaders(clt); if (clt->clt_fcgi_headersdone) { if (server_fcgi_header(clt, |