cvs: php4 /sapi/apache2filter config.m4 sapi_apache2.c

rasmus Mon Jun 24 10:51:03 2002 EDT Modified files: /php4/sapi/apache2filter config.m4 sapi_apache2.c Log: @ Turn off ZTS if Apache2 is using the prefork MPM. (Rasmus) Index: php4/sapi/apache2filter/config.m4 diff -u php4/sapi/apache2filter/config.m4:1.17 php4/sapi/apache2filter/config.m4:1.18 --- php4/sapi/apache2filter/config.m4:1.17 Fri May 17 04:07:14 2002 +++ php4/sapi/apache2filter/config.m4 Mon Jun 24 10:51:01 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.17 2002/05/17 08:07:14 jwoolley Exp $ +dnl $Id: config.m4,v 1.18 2002/06/24 14:51:01 rasmus Exp $ dnl AC_MSG_CHECKING(for Apache 2.0 module support via DSO through APXS) @@ -34,6 +34,7 @@ APXS_INCLUDEDIR=$APXS -q INCLUDEDIR APXS_HTTPD=$APXS -q SBINDIR/$APXS -q TARGET APXS_CFLAGS=$APXS -q CFLAGS + APXS_MPM=$APXS -q MPM_NAME for flag in $APXS_CFLAGS; do case $flag in @@ -81,7 +82,9 @@ esac PHP_ADD_INCLUDE($APXS_INCLUDEDIR) - PHP_BUILD_THREAD_SAFE + if test "$APXS_MPM" != "prefork"; then + PHP_BUILD_THREAD_SAFE + fi AC_MSG_RESULT(yes) ],[ AC_MSG_RESULT(no) Index: php4/sapi/apache2filter/sapi_apache2.c diff -u php4/sapi/apache2filter/sapi_apache2.c:1.78 php4/sapi/apache2filter/sapi_apache2.c:1.79 --- php4/sapi/apache2filter/sapi_apache2.c:1.78 Fri Jun 21 10:47:59 2002 +++ php4/sapi/apache2filter/sapi_apache2.c Mon Jun 24 10:51:01 2002 @@ -428,7 +428,9 @@ { apache2_sapi_module.shutdown(&apache2_sapi_module); sapi_shutdown(); +#ifdef ZTS tsrm_shutdown(); +#endif return APR_SUCCESS; } @@ -473,8 +475,9 @@ if (apache2_php_ini_path_override) { apache2_sapi_module.php_ini_path_override = apache2_php_ini_path_override; } - +#ifdef ZTS tsrm_startup(1, 1, 0, NULL); +#endif sapi_startup(&apache2_sapi_module); apache2_sapi_module.startup(&apache2_sapi_module); apr_pool_cleanup_register(pconf, NULL, php_apache_server_shutdown, apr_pool_cleanup_null);