From: Lars Strojny <lstrojny@php.net>
Date: Sun, 9 Mar 2008 01:10:13 +0000 (+0000)
Subject: Adding itk and and peruser MPM to the list of threaded Apache MPMs
X-Git-Tag: RELEASE_2_0_0a1~201
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b15b1dceddb4b97cbf4cf75bbff0574a600a8097;p=php

Adding itk and and peruser MPM to the list of threaded Apache MPMs
---

diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4
index 2fb82a3dbe..4f76566346 100644
--- a/sapi/apache2filter/config.m4
+++ b/sapi/apache2filter/config.m4
@@ -110,7 +110,7 @@ if test "$PHP_APXS2FILTER" != "no"; then
     `ln -s $APXS_BINDIR/httpd _APP_`
     EXTRA_LIBS="$EXTRA_LIBS _APP_"
     PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS)
-    INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" 
+    INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
     ;;
   *)
     PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) 
@@ -118,7 +118,7 @@ if test "$PHP_APXS2FILTER" != "no"; then
     ;;
   esac
 
-  if test "$APXS_MPM" != "prefork"; then
+  if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
     PHP_BUILD_THREAD_SAFE
   fi
   AC_MSG_RESULT(yes)
diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
index 180f0e4348..f639ca9185 100644
--- a/sapi/apache2handler/config.m4
+++ b/sapi/apache2handler/config.m4
@@ -117,7 +117,7 @@ if test "$PHP_APXS2" != "no"; then
     ;;
   esac
 
-  if test "$APXS_MPM" != "prefork"; then
+  if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
     PHP_BUILD_THREAD_SAFE
   fi
   AC_MSG_RESULT(yes)