www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-27 16:41:57 +03:00
Code Activity

Remove all pthreads calls from the mpmt MPM prefork emulation. This makes

Browse Source 
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
This commit is contained in:
Ryan Bloom
2000-07-11 19:00:16 +00:00
parent 86ef0b09b5
commit ffd0a49e40
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/mpm/config.m4
View File

@@ -43,8 +43,9 @@ MPM_LIB=$MPM_DIR/lib${MPM_NAME}.la
if test "$mpm_explicit" = "no"; then if test "$mpm_explicit" = "no"; then
if test "$MPM_NAME" = "prefork" ; then if test "$MPM_NAME" = "prefork" ; then
MPM_NAME="mpmt_pthread" MPM_NAME="prefork"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DNO_THREADS" MPM_FAKE_NAME=prefork.c
EXTRA_CFLAGS="$EXTRA_CFLAGS -DPREFORK"
ac_cv_enable_threads="no" ac_cv_enable_threads="no"
AC_CACHE_SAVE AC_CACHE_SAVE
@@ -69,7 +70,7 @@ dnl and actually find it.
ln -s mpmt.c modules/mpm/mpmt/dexter.c ln -s mpmt.c modules/mpm/mpmt/dexter.c
fi 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_DIR=modules/mpm/mpmt;
MPM_LIB=$MPM_DIR/libmpmt.la MPM_LIB=$MPM_DIR/libmpmt.la
MPM_NAME="mpmt" MPM_NAME="mpmt"

2
server/mpm_common.c
View File

@@ -81,7 +81,7 @@
#if defined(DEXTER) || defined(MPMT_BEOS_MPM) || defined(BEOS_MPM) #if defined(DEXTER) || defined(MPMT_BEOS_MPM) || defined(BEOS_MPM)
#define CHILD_TABLE 1 #define CHILD_TABLE 1
#define CHILD_INFO_TABLE ap_child_table #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 SCOREBOARD 1
#define CHILD_INFO_TABLE ap_scoreboard_image->parent #define CHILD_INFO_TABLE ap_scoreboard_image->parent
#endif #endif