diff options
Diffstat (limited to 'sapi/apache2filter')
| -rw-r--r-- | sapi/apache2filter/config.m4 | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4 index b10720a18a..c49488d182 100644 --- a/sapi/apache2filter/config.m4 +++ b/sapi/apache2filter/config.m4 @@ -39,7 +39,6 @@ if test "$PHP_APXS2FILTER" != "no"; then APXS_BINDIR=`$APXS -q BINDIR` APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET` APXS_CFLAGS=`$APXS -q CFLAGS` - APXS_MPM=`$APXS -q MPM_NAME` APU_BINDIR=`$APXS -q APU_BINDIR` APR_BINDIR=`$APXS -q APR_BINDIR` @@ -118,8 +117,16 @@ if test "$PHP_APXS2FILTER" != "no"; then ;; esac - if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser"; then - PHP_BUILD_THREAD_SAFE + if test "$APACHE_VERSION" -lt 2004001; then + APXS_MPM=`$APXS -q MPM_NAME` + if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then + PHP_BUILD_THREAD_SAFE + fi + else + APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'` + if test -n "$APACHE_THREADED_MPM"; then + PHP_BUILD_THREAD_SAFE + fi fi AC_MSG_RESULT(yes) PHP_SUBST(APXS) |