Commit 1695d0e7 authored by Paul Querna's avatar Paul Querna
Browse files

Add ap_mpm_is_experimental and ap_mpm_is_threaded. Use these instead of... 

Add ap_mpm_is_experimental and ap_mpm_is_threaded.  Use these instead of checking for specific MPMs.


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

modules/generators/config5.m4

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ APACHE_MODULE(info, server information, , , most) 
APACHE_MODULE(suexec, set uid and gid for spawned processes, , , no, [

              other_targets=suexec ] )



if test "$apache_cv_mpm" != "prefork"; then

if ap_mpm_is_threaded; then

# if we are using a threaded MPM, we will get better performance with

# mod_cgid, so make it the default.

    APACHE_MODULE(cgid, CGI scripts, , , yes)

server/mpm/config.m4

+20 −2
Original line number Diff line number Diff line
@@ -12,7 +12,25 @@ AC_MSG_RESULT($APACHE_MPM) 


apache_cv_mpm=$APACHE_MPM

	

ap_mpm_is_threaded ()

{

    if test "$apache_cv_mpm" = "worker" -o "$apache_cv_mpm" = "event" -o "$apache_cv_mpm" = "perchild" -o "$apache_cv_mpm" = "leader" -o "$apache_cv_mpm" = "threadpool" ; then

        return 0

    else

        return 1

    fi

}



ap_mpm_is_experimental ()

{

    if test "$apache_cv_mpm" = "event" -o "$apache_cv_mpm" = "perchild" -o "$apache_cv_mpm" = "leader" -o "$apache_cv_mpm" = "threadpool" ; then

        return 0

    else

        return 1

    fi

}



if ap_mpm_is_threaded; then

  APR_CHECK_APR_DEFINE(APR_HAS_THREADS)



  if test "x$ac_cv_define_APR_HAS_THREADS" = "xno"; then
@@ -26,7 +44,7 @@ fi 
APACHE_FAST_OUTPUT(server/mpm/Makefile)



MPM_NAME=$apache_cv_mpm

if test "$MPM_NAME" = "event" -o "$MPM_NAME" = "leader" -o "$MPM_NAME" = "threadpool" -o "$MPM_NAME" = "perchild"; then

if ap_mpm_is_experimental; then

  AC_MSG_WARN(You have selected an EXPERIMENTAL MPM.  Be warned!)

  MPM_SUBDIR_NAME=experimental/$MPM_NAME

else