lstrojny Sun Mar 9 01:10:25 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/apache2filter config.m4
/php-src/sapi/apache2handler config.m4
Log:
Adding itk and and peruser MPM to the list of threaded Apache MPMs
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/config.m4?r1=1.41.2.1.2.2&r2=1.41.2.1.2.2.2.1&diff_format=u
Index: php-src/sapi/apache2filter/config.m4
diff -u php-src/sapi/apache2filter/config.m4:1.41.2.1.2.2
php-src/sapi/apache2filter/config.m4:1.41.2.1.2.2.2.1
--- php-src/sapi/apache2filter/config.m4:1.41.2.1.2.2 Wed Jul 11 23:20:36 2007
+++ php-src/sapi/apache2filter/config.m4 Sun Mar 9 01:10:25 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.41.2.1.2.2 2007/07/11 23:20:36 jani Exp $
+dnl $Id: config.m4,v 1.41.2.1.2.2.2.1 2008/03/09 01:10:25 lstrojny Exp $
dnl
PHP_ARG_WITH(apxs2filter,,
@@ -110,7 +110,7 @@
`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 @@
;;
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)
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/config.m4?r1=1.14.2.1.2.2&r2=1.14.2.1.2.2.2.1&diff_format=u
Index: php-src/sapi/apache2handler/config.m4
diff -u php-src/sapi/apache2handler/config.m4:1.14.2.1.2.2
php-src/sapi/apache2handler/config.m4:1.14.2.1.2.2.2.1
--- php-src/sapi/apache2handler/config.m4:1.14.2.1.2.2 Wed Jul 11 23:20:36 2007
+++ php-src/sapi/apache2handler/config.m4 Sun Mar 9 01:10:25 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.14.2.1.2.2 2007/07/11 23:20:36 jani Exp $
+dnl $Id: config.m4,v 1.14.2.1.2.2.2.1 2008/03/09 01:10:25 lstrojny Exp $
dnl
PHP_ARG_WITH(apxs2,,
@@ -109,7 +109,7 @@
`ln -s $APXS_BINDIR/httpd _APP_`
EXTRA_LIBS="$EXTRA_LIBS _APP_"
PHP_SELECT_SAPI(apache2handler, shared, mod_php5.c 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(apache2handler, shared, mod_php5.c sapi_apache2.c
apache_config.c php_functions.c, $APACHE_CFLAGS)
@@ -117,7 +117,7 @@
;;
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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
