From 8942a4cdad24591604da8694ec82a833917aa953 Mon Sep 17 00:00:00 2001
From: valenok <devnull@localhost>
Date: Wed, 22 Jun 2011 00:45:08 +0100
Subject: [PATCH] Ignoring SIGCHLD to let OS reap the zombies.

---
 mongoose.c | 5 ++---
 mongoose.h | 5 +++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/mongoose.c b/mongoose.c
index c0e0d9a5..51e9bb14 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -2993,9 +2993,6 @@ static void handle_cgi_request(struct mg_connection *conn, const char *prog) {
 done:
   if (pid != (pid_t) -1) {
     kill(pid, SIGKILL);
-#if !defined(_WIN32)
-    do {} while (waitpid(-1, &i, WNOHANG) > 0);
-#endif
   }
   if (fd_stdin[0] != -1) {
     (void) close(fd_stdin[0]);
@@ -4133,6 +4130,8 @@ struct mg_context *mg_start(mg_callback_t user_callback, void *user_data,
   // Ignore SIGPIPE signal, so if browser cancels the request, it
   // won't kill the whole process.
   (void) signal(SIGPIPE, SIG_IGN);
+  // Also ignoring SIGCHLD to let the OS to reap zombies properly.
+  (void) signal(SIGCHLD, SIG_IGN);
 #endif // !_WIN32
 
   (void) pthread_mutex_init(&ctx->mutex, NULL);
diff --git a/mongoose.h b/mongoose.h
index 3f5d3e82..449ee7b1 100644
--- a/mongoose.h
+++ b/mongoose.h
@@ -88,6 +88,11 @@ typedef void * (*mg_callback_t)(enum mg_event event,
 //   options: NULL terminated list of option_name, option_value pairs that
 //            specify Mongoose configuration parameters.
 //
+// Side-effects: on UNIX, ignores SIGCHLD and SIGPIPE signals. If custom
+//    processing is required for these, signal handlers must be set up
+//    after calling mg_start().
+//
+//
 // Example:
 //   const char *options[] = {
 //     "document_root", "/var/www",