Imported Upstream version 1.4.30upstream/1.4.30

1 files changed, 8 insertions, 0 deletions

diff --git a/src/server.c b/src/server.c
index 5fcbfe4..bad6c07 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1120,6 +1120,14 @@ int main (int argc, char **argv) {
 				"s", "fdevent_init failed");
 		return -1;
 	}
+
+	/* libev backend overwrites our SIGCHLD handler and calls waitpid on SIGCHLD; we want our own SIGCHLD handling. */
+#ifdef HAVE_SIGACTION
+	sigaction(SIGCHLD, &act, NULL);
+#elif defined(HAVE_SIGNAL)
+	signal(SIGCHLD,  signal_handler);
+#endif
+
 	/*
 	 * kqueue() is called here, select resets its internals,
 	 * all server sockets get their handlers