summaryrefslogtreecommitdiffstats
path: root/usr.sbin/httpd/proc.c
diff options
context:
space:
mode:
authorreyk <reyk@openbsd.org>2014-08-04 15:49:28 +0000
committerreyk <reyk@openbsd.org>2014-08-04 15:49:28 +0000
commit844c36159ebc63d46c68376392f46bcb30e544cd (patch)
treea30af61b1be68c1ca83f706e784554adc1658ca9 /usr.sbin/httpd/proc.c
parentFree the SSL context first and let the reference counting do its thing. (diff)
downloadwireguard-openbsd-844c36159ebc63d46c68376392f46bcb30e544cd.tar.xz
wireguard-openbsd-844c36159ebc63d46c68376392f46bcb30e544cd.zip
Add initial support for log files in /var/www/logs/. Logging with
syslog is still supported but disabled by default. ok deraadt@
Diffstat (limited to 'usr.sbin/httpd/proc.c')
-rw-r--r--usr.sbin/httpd/proc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/httpd/proc.c b/usr.sbin/httpd/proc.c
index 8e522f0c4bd..25feff1ff7f 100644
--- a/usr.sbin/httpd/proc.c
+++ b/usr.sbin/httpd/proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.c,v 1.3 2014/08/04 11:09:25 reyk Exp $ */
+/* $OpenBSD: proc.c,v 1.4 2014/08/04 15:49:28 reyk Exp $ */
/*
* Copyright (c) 2010 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -321,6 +321,7 @@ proc_sig_handler(int sig, short event, void *arg)
case SIGCHLD:
case SIGHUP:
case SIGPIPE:
+ case SIGUSR1:
/* ignore */
break;
default:
@@ -407,12 +408,14 @@ proc_run(struct privsep *ps, struct privsep_proc *p,
signal_set(&ps->ps_evsigchld, SIGCHLD, proc_sig_handler, p);
signal_set(&ps->ps_evsighup, SIGHUP, proc_sig_handler, p);
signal_set(&ps->ps_evsigpipe, SIGPIPE, proc_sig_handler, p);
+ signal_set(&ps->ps_evsigusr1, SIGUSR1, proc_sig_handler, p);
signal_add(&ps->ps_evsigint, NULL);
signal_add(&ps->ps_evsigterm, NULL);
signal_add(&ps->ps_evsigchld, NULL);
signal_add(&ps->ps_evsighup, NULL);
signal_add(&ps->ps_evsigpipe, NULL);
+ signal_add(&ps->ps_evsigusr1, NULL);
proc_listen(ps, procs, nproc);