Commit Diff

Commit:
ea827802c0280cb0d5539553eabb137f990fb926
From:
Omar Polo <op@omarpolo.com>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
gotwebd: fix broken signal catching due to a pasto While here, remove completely the libevent handling of SIGPIPE in favour of the already existing signal(3) call to ignore it; there's no point in logging a SIGPIPE.
Actions:
Patch | Tree
commit - 3f69050e707b0f3c73aecf3053782433bc7b328b
commit + ea827802c0280cb0d5539553eabb137f990fb926
blob - 9bc30d898bbeace1de6db826d8fdd38f722fe4f3
blob + c2397c84d7c5b27ebd5bbaf41e79d15f5d275a82
--- gotwebd/sockets.c
+++ gotwebd/sockets.c
@@ -88,7 +88,7 @@ int cgi_inflight = 0;
 void
 sockets(struct gotwebd *env, int fd)
 {
-	struct event	 sighup, sigpipe, sigusr1, sigchld;
+	struct event	 sighup, sigusr1, sigchld;
 
 	event_init();
 
@@ -108,11 +108,9 @@ sockets(struct gotwebd *env, int fd)
 
 	signal(SIGPIPE, SIG_IGN);
 
-	signal_set(&sighup, SIGCHLD, sockets_sighdlr, env);
+	signal_set(&sighup, SIGHUP, sockets_sighdlr, env);
 	signal_add(&sighup, NULL);
-	signal_set(&sigpipe, SIGCHLD, sockets_sighdlr, env);
-	signal_add(&sigpipe, NULL);
-	signal_set(&sigusr1, SIGCHLD, sockets_sighdlr, env);
+	signal_set(&sigusr1, SIGUSR1, sockets_sighdlr, env);
 	signal_add(&sigusr1, NULL);
 	signal_set(&sigchld, SIGCHLD, sockets_sighdlr, env);
 	signal_add(&sigchld, NULL);