You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rs...@hyperreal.org on 1999/07/04 11:13:34 UTC
cvs commit: apache-2.0/mpm/src/include httpd.h
rse 99/07/04 02:13:33
Modified: mpm configure
mpm/src Configuration.mpm Configuration.tmpl Configure
mpm/src/include httpd.h
Removed: mpm Makefile config.status
Log:
Some cleanups to the apache-mpm stuff and one major config change:
Rule's aren't intended to get a value other than yes/no/default assigned, so
it doesn't play nice with the existing config stuff. I suggest that we rename
"Rule MPM_METHOD=default" to a variable "MPM_METHOD=default" (which can then
get any value assigned) and for enabling the stuff we use a boolean "Rule
MPM=default". This way one can configure apache-mpm for preforking via
$ ./configure --enable-rule=MPM
or explicitly
$ MPM_METHOD=prefork ./configure --enable-rule=MPM
and for threading via:
$ MPM_METHOD=mpmt_pthread ./configure --enable-rule=MPM
Dean, I hope it is ok for you. If not, just complain.
Revision Changes Path
1.2 +2 -2 apache-2.0/mpm/configure
Index: configure
===================================================================
RCS file: /home/cvs/apache-2.0/mpm/configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure 1999/06/18 18:39:12 1.1
+++ configure 1999/07/04 09:13:29 1.2
@@ -957,7 +957,7 @@
echo "##" >>$configstatus
echo "" >>$configstatus
for var in CC CPP OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \
- LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS TARGET; do
+ LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS TARGET MPM_METHOD; do
eval "val=\"\$$var\""
if [ "x$val" != "x" ]; then
echo "$var=$val" |\
@@ -1254,7 +1254,7 @@
OIFS="$IFS"
IFS="$DIFS"
for var in CC CPP OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \
- LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS TARGET; do
+ LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS TARGET MPM_METHOD; do
eval "val=\"\$$var\"";
if [ "x$val" != "x" ]; then
case $var in
1.11 +3 -3 apache-2.0/mpm/src/Configuration.mpm
Index: Configuration.mpm
===================================================================
RCS file: /home/cvs/apache-2.0/mpm/src/Configuration.mpm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Configuration.mpm 1999/06/23 00:42:25 1.10
+++ Configuration.mpm 1999/07/04 09:13:30 1.11
@@ -23,9 +23,9 @@
Rule PARANOID=no
Rule EXPAT=no
Rule WANTHSREGEX=default
-Rule MPM_METHOD=default
-#Rule MPM_METHOD=prefork
-#Rule MPM_METHOD=mpmt_pthread
+Rule MPM=default
+MPM_METHOD=prefork
+#MPM_METHOD=mpmt_pthread
#
# AddModule modules/experimental/mod_mmap_static.o
AddModule modules/standard/mod_env.o
1.3 +2 -1 apache-2.0/mpm/src/Configuration.tmpl
Index: Configuration.tmpl
===================================================================
RCS file: /home/cvs/apache-2.0/mpm/src/Configuration.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Configuration.tmpl 1999/07/04 08:45:23 1.2
+++ Configuration.tmpl 1999/07/04 09:13:31 1.3
@@ -196,7 +196,8 @@
# MPM Support:
# Available MPM modules: prefork (default), mpmt_pthread
-Rule MPM_METHOD=default
+Rule MPM=default
+MPM_METHOD=default
################################################################
# Module configuration
1.9 +21 -12 apache-2.0/mpm/src/Configure
Index: Configure
===================================================================
RCS file: /home/cvs/apache-2.0/mpm/src/Configure,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Configure 1999/06/24 01:57:45 1.8
+++ Configure 1999/07/04 09:13:31 1.9
@@ -227,7 +227,7 @@
RULE_EXPAT=`./helpers/CutRule EXPAT $file`
RULE_SHARED_CORE=`./helpers/CutRule SHARED_CORE $file`
RULE_SHARED_CHAIN=`./helpers/CutRule SHARED_CHAIN $file`
-RULE_MPM_METHOD=`./helpers/CutRule MPM_METHOD $file`
+RULE_MPM=`./helpers/CutRule MPM $file`
####################################################################
## Rule SHARED_CORE implies required DSO support
@@ -810,13 +810,23 @@
####################################################################
## Now handle the MPM implementation. Default to 1.3 prefork
##
-if [ "x$RULE_MPM_METHOD" = "xdefault" ]; then
- if [ "x$DEF_MPM_METHOD" = "x" ]; then
- RULE_MPM_METHOD=prefork
- else
- RULE_MPM_METHOD=$DEF_MPM_METHOD
- fi
+if [ "x$RULE_MPM" = "xdefault" ]; then
+ if [ "x$DEF_MPM" = "x" ]; then
+ RULE_MPM=yes
+ else
+ RULE_MPM=$DEF_MPM
+ fi
fi
+if [ "x$RULE_MPM" = "xyes" ]; then
+ MPM_METHOD=`egrep '^MPM_METHOD=' Makefile.config | tail -1 | awk -F= '{print $2}'`
+ if [ "x$MPM_METHOD" = "xdefault" ]; then
+ if [ "x$DEF_MPM_METHOD" = "x" ]; then
+ MPM_METHOD="prefork"
+ else
+ MPM_METHOD="$DEF_MPM_METHOD"
+ fi
+ fi
+fi
####################################################################
## Now we determine the C-compiler and optimization level
@@ -1478,12 +1488,11 @@
echo " + adding selected modules"
-##
# First, add the shadow MPM method module
-##
-echo "AddModule modules/mpm/$RULE_MPM_METHOD/lib$RULE_MPM_METHOD.a" >> $tmpfile
-
-echo " - using mpm method $RULE_MPM_METHOD "
+if [ "x$RULE_MPM" = "xyes" ]; then
+ echo "AddModule modules/mpm/$MPM_METHOD/lib$MPM_METHOD.a" >> $tmpfile
+ echo " - using MPM method: $MPM_METHOD "
+fi
MODFILES=`awk <$tmpfile '($1 == "AddModule" || $1 == "SharedModule") { printf "%s ", $2 }'`
MODDIRS=`awk < $tmpfile '
1.5 +1 -1 apache-2.0/mpm/src/include/httpd.h
Index: httpd.h
===================================================================
RCS file: /home/cvs/apache-2.0/mpm/src/include/httpd.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- httpd.h 1999/06/29 09:00:09 1.4
+++ httpd.h 1999/07/04 09:13:32 1.5
@@ -426,7 +426,7 @@
* Example: "Apache/1.1.0 MrWidget/0.1-alpha"
*/
-#define SERVER_BASEVERSION "Apache/pthreads-dev" /* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION "Apache/mpm-dev" /* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
/* TODO: re-implement the server token/version stuff -- it's part of http_core