Commit 6cf8ba45 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Add the worker MPM. The name is probably horrible, but I couldn't come 

up with anything better.  This is a multiple-worker/single listener MPM.
This MPM is definately not complete, but it is a first step in the
right direction.


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

CHANGES

+5 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.23



  *) Add a single listener/multiple worker MPM.  This MPM is

     definately not fully correct, but it allows us to solve many

     of the problems that exist in the threaded MPM.  This is a 

     modified version of the threaded MPM.  [Ryan Bloom]



  *) Improve content generation throughout Apache, providing closer

     compliance with HTML 3.2, HTML 4.01 Transitional and XHTML 1.0

     Transitional specifications.  [William Rowe]

server/mpm/config.m4

+2 −2
Original line number Diff line number Diff line 
AC_MSG_CHECKING(which MPM to use)

AC_ARG_WITH(mpm,

[  --with-mpm=MPM          Choose the process model for Apache to use.

                          MPM={beos,threaded,prefork,spmt_os2,perchild}],[

                          MPM={beos,worker,threaded,prefork,spmt_os2,perchild}],[

  APACHE_MPM=$withval

],[

  if test "x$APACHE_MPM" = "x"; then
@@ -12,7 +12,7 @@ AC_MSG_RESULT($APACHE_MPM) 


apache_cv_mpm=$APACHE_MPM

	

if test "$apache_cv_mpm" = "threaded" -o "$apache_cv_mpm" = "perchild"; then

if test "$apache_cv_mpm" = "threaded" -o "$apache_cv_mpm" = "worker" -o "$apache_cv_mpm" = "perchild"; then

  APR_CHECK_APR_DEFINE(APR_HAS_THREADS, srclib/apr)



  if test "x$ac_cv_define_APR_HAS_THREADS" = "xno"; then

server/mpm/worker/.cvsignore

0 → 100644
+5 −0
Original line number Diff line number Diff line 
.deps

.libs

*.lo

*.la

Makefile

server/mpm/worker/Makefile.in

0 → 100644
+5 −0
Original line number Diff line number Diff line 


LTLIBRARY_NAME    = libworker.la

LTLIBRARY_SOURCES = worker.c fdqueue.c



include $(top_srcdir)/build/ltlib.mk

server/mpm/worker/config5.m4

0 → 100644
+5 −0
Original line number Diff line number Diff line 
dnl ## XXX - Need a more thorough check of the proper flags to use



if test "$MPM_NAME" = "worker" ; then

    APACHE_FAST_OUTPUT(server/mpm/$MPM_NAME/Makefile)

fi