From ffd0a49e40dc57eaefba056463d730c71968e89c Mon Sep 17 00:00:00 2001 From: Ryan Bloom Date: Tue, 11 Jul 2000 19:00:16 +0000 Subject: [PATCH] Remove all pthreads calls from the mpmt MPM prefork emulation. This makes the mpmt MPM look almost exactly like the original prefork MPM. Basically, all that's left is re-naming the defined directives so they work with 1.3 config files. That will come later. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85819 13f79535-47bb-0310-9956-ffa450edef68 --- server/mpm/config.m4 | 7 ++++--- server/mpm_common.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/server/mpm/config.m4 b/server/mpm/config.m4 index 194f1f0963..2b30ff646e 100644 --- a/server/mpm/config.m4 +++ b/server/mpm/config.m4 @@ -43,8 +43,9 @@ MPM_LIB=$MPM_DIR/lib${MPM_NAME}.la if test "$mpm_explicit" = "no"; then if test "$MPM_NAME" = "prefork" ; then - MPM_NAME="mpmt_pthread" - EXTRA_CFLAGS="$EXTRA_CFLAGS -DNO_THREADS" + MPM_NAME="prefork" + MPM_FAKE_NAME=prefork.c + EXTRA_CFLAGS="$EXTRA_CFLAGS -DPREFORK" ac_cv_enable_threads="no" AC_CACHE_SAVE @@ -69,7 +70,7 @@ dnl and actually find it. ln -s mpmt.c modules/mpm/mpmt/dexter.c fi - if test "$MPM_NAME" = "dexter" -o "$MPM_NAME" = "mpmt_pthread"; then + if test "$MPM_NAME" = "dexter" -o "$MPM_NAME" = "mpmt_pthread" -o "$MPM_NAME" = "prefork"; then MPM_DIR=modules/mpm/mpmt; MPM_LIB=$MPM_DIR/libmpmt.la MPM_NAME="mpmt" diff --git a/server/mpm_common.c b/server/mpm_common.c index d24cc11396..2c8cb825da 100644 --- a/server/mpm_common.c +++ b/server/mpm_common.c @@ -81,7 +81,7 @@ #if defined(DEXTER) || defined(MPMT_BEOS_MPM) || defined(BEOS_MPM) #define CHILD_TABLE 1 #define CHILD_INFO_TABLE ap_child_table -#elif defined(MPMT_PTHREAD) || defined (NO_THREADS) || defined(PREFORK_MPM) +#elif defined(MPMT_PTHREAD) || defined (PREFORK) || defined(PREFORK_MPM) #define SCOREBOARD 1 #define CHILD_INFO_TABLE ap_scoreboard_image->parent #endif