fix segv in worker MPM following check_pipe_of_death() call

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92130 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index ae896c9568bcd96fc61a0aa045a514742986d444..fbc5e8ac84eacbebe6b3a2d21e9cecc784fc3ba3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.29-dev
 
+  *) Fix segv in worker MPM following accept on pipe-of-death
+     [Brian Pane]
+
   *) Add mod_deflate to experimental.  
      [Ian Holsman, Justin Erenkrantz]
 

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index d29e22881ca7ac62405b7e05dbb42f8b9b4a56b9..339315d48ad6c2e2d97c36c07e4bfbea9b4d69e3 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -531,6 +531,7 @@ static void check_infinite_requests(void)
 /* Sets workers_may_exit if we received a character on the pipe_of_death */
 static apr_status_t check_pipe_of_death(void **csd, ap_listen_rec *lr, apr_pool_t *ptrans)
 {
+    *csd = NULL;
     apr_thread_mutex_lock(pipe_of_death_mutex);
     if (!workers_may_exit) {
         apr_status_t ret;