Instead of blocking all signals in child_main, we were unblocking them;

this fixes that. Reported by Dave Colasurdo <davecola@us.ibm.com>.

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

diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index 82e72637ca5a1e48ad9fb716a29c2866ce33f9eb..df33c898a820890be73b023791321570b42ba5ca 100644 (file)
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -997,7 +997,7 @@ static void child_main(int child_num_arg)
     /*done with init critical section */
 
     /* All threads should mask signals out, accoring to sigwait(2) man page */
-    sigemptyset(&sig_mask);
+    sigfillset(&sig_mask);
 
     if (pthread_sigmask(SIG_SETMASK, &sig_mask, NULL) != 0) {
         ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf, "pthread_sigmask");

diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index 908cf02e5172c57d353ad1cd57c962cdfbbb4146..bff711e9e3d02fc580b24203690c98abadb2fd26 100644 (file)
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -935,7 +935,7 @@ static void child_main(int child_num_arg)
     /*done with init critical section */
 
     /* All threads should mask signals out, accoring to sigwait(2) man page */
-    sigemptyset(&sig_mask);
+    sigfillset(&sig_mask);
 
     if (pthread_sigmask(SIG_SETMASK, &sig_mask, NULL) != 0) {
         ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf, "pthread_sigmask");