]> granicus.if.org Git - php/commitdiff
Adding itk and and peruser MPM to the list of threaded Apache MPMs
authorLars Strojny <lstrojny@php.net>
Sun, 9 Mar 2008 01:10:13 +0000 (01:10 +0000)
committerLars Strojny <lstrojny@php.net>
Sun, 9 Mar 2008 01:10:13 +0000 (01:10 +0000)
sapi/apache2filter/config.m4
sapi/apache2handler/config.m4

index 2fb82a3dbefe245a037e36b90044c7ce04ee3227..4f765663466373ea53cf364b8a989f92695f6964 100644 (file)
@@ -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)
index 180f0e434818b2e213b8c2d26f2c05c4d937d6ba..f639ca918581f7b65bbbc35b8bd0c18de6d7f3a8 100644 (file)
@@ -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)