diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | configure.in | 15 | ||||
| -rw-r--r-- | sapi/apache2filter/config.m4 | 13 | ||||
| -rw-r--r-- | sapi/apache2handler/config.m4 | 13 |
4 files changed, 38 insertions, 6 deletions
@@ -22,6 +22,9 @@ PHP NEWS (rui, Gustavo) . Fixed bug #51860 (Include fails with toplevel symlink to /). (Dmitry) +- Installation + . Fixed bug #61172 (Add Apache 2.4 support). (Chris Jones) + - Fileinfo . Fixed bug #61173 (Unable to detect error from finfo constructor). (Gustavo) diff --git a/configure.in b/configure.in index 7ed2d93912..8f579eff61 100644 --- a/configure.in +++ b/configure.in @@ -1550,6 +1550,21 @@ cat <<X X fi + if test "$PHP_SAPI" = "apache2handler" || test "$PHP_SAPI" = "apache2filter"; then + if test "$APACHE_VERSION" -ge 2004001; then + if test -z "$APACHE_THREADED_MPM"; then +cat <<X ++--------------------------------------------------------------------+ +| *** WARNING *** | +| | +| You have built PHP for Apache's current non-threaded MPM. | +| If you change Apache to use a threaded MPM you must reconfigure | +| PHP with --enable-maintainer-zts | +X + fi + fi + fi + # Warn about linking Apache with libpthread if oci8 extension is enabled on linux. if test "$PHP_OCI8" != "no"; then if test "$PHP_SAPI" = "apache"; then 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) diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 index 95217908fd..702f91f5d2 100644 --- a/sapi/apache2handler/config.m4 +++ b/sapi/apache2handler/config.m4 @@ -38,7 +38,6 @@ if test "$PHP_APXS2" != "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` @@ -117,8 +116,16 @@ if test "$PHP_APXS2" != "no"; then ;; esac - if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; 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) |