Commit Diff

Commit:
56a9d3151cd30e0b62e13d1469bc2f6b6a24f231
From:
Omar Polo <op@omarpolo.com>
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 - 6d0030ba1d9985fc8b8a9a2dc0f0c412c2c678da
commit + 56a9d3151cd30e0b62e13d1469bc2f6b6a24f231
blob - 4ac43e3ddee0f601ea33b3a80f934242683cdc4c
blob + a0576465ae834d0f074a2d8dc1fbbb6ecec3186a
--- 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);