Add ap_sigwait() to support old-style sigwait().

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

diff --git a/acinclude.m4 b/acinclude.m4
index 2113a9423edf98bf1ff78c1af9a094b33306c9d1..1f19e59a1bb33b5f72d8736c61204d08d248c222 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -177,6 +177,24 @@ unsigned long foo = INADDR_NONE;
   fi
 ])
 
+AC_DEFUN(APACHE_CHECK_SIGWAIT_ONE_ARG,[
+  AC_CACHE_CHECK(whether sigwait takes one argument,ac_cv_sigwait_one_arg,[
+  AC_TRY_COMPILE([
+#include <signal.h>
+],[
+  sigset_t set;
+
+  sigwait(&set);
+],[
+  ac_cv_sigwait_one_arg=yes
+],[
+  ac_cv_sigwait_one_arg=no
+])])
+  if test "$ac_cv_sigwait_one_arg" = "yes"; then
+    AC_DEFINE(SIGWAIT_TAKES_ONE_ARG,1,[ ])
+  fi
+])
+
 AC_DEFUN(APACHE_CHECK_SHM_RW,[
   AC_CACHE_CHECK([whether system defines SHM_R,SHM_W],ac_cv_shm_rw,[
   AC_TRY_COMPILE([

diff --git a/server/mpm/config.m4 b/server/mpm/config.m4
index f431db5a4eb869818cc06d57d869feb65956045c..2e3d53bd3c606579428f1e2e7c3c6c54906ec08b 100644 (file)
--- a/server/mpm/config.m4
+++ b/server/mpm/config.m4
@@ -29,6 +29,7 @@ if test "$apache_cv_mpm" = "mpmt_pthread" -o "$apache_cv_mpm" = "dexter"; then
   fi
 fi
 
+APACHE_CHECK_SIGWAIT_ONE_ARG
 APACHE_CHECK_SHM_RW
 
 APACHE_FAST_OUTPUT(modules/mpm/Makefile)

diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index c3e6362e82be9603da13232a5ac987e6b02c9b4d..fcebdcd2b1aaf57ef19f81f492d5ff9580ad91df 100644 (file)
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -928,7 +928,7 @@ static void child_main(int child_num_arg)
     sigemptyset(&sig_mask);
     sigaddset(&sig_mask, SIGTERM);
     sigaddset(&sig_mask, SIGINT);
-    sigwait(&sig_mask, &signal_received);
+    ap_sigwait(&sig_mask, &signal_received);
     switch (signal_received) {
         case SIGTERM:
         case SIGINT:

diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index 6c1c92b1bdab7a98823cc696650a63693e42d3be..ee736b584e1c474d9938e4ebee2273ea9eadea6c 100644 (file)
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -892,7 +892,7 @@ static void child_main(int child_num_arg)
     sigemptyset(&sig_mask);
     sigaddset(&sig_mask, SIGTERM);
     sigaddset(&sig_mask, SIGINT);
-    sigwait(&sig_mask, &signal_received);
+    ap_sigwait(&sig_mask, &signal_received);
     switch (signal_received) {
         case SIGTERM:
         case SIGINT: