php.net | support | documentation | report a bug | advanced search | search howto | statistics | random bug | login | |
Patch bug61172.patch.txt for Compile Failure Bug #61172Patch version 2012-02-28 22:57 UTC Return to Bug #61172 | Download this patchThis patch renders other patches obsolete Obsolete patches: Patch Revisions: 2012-02-28 22:57 UTC | 2012-02-24 19:20 UTC | 2012-02-24 00:44 UTCDeveloper: sixd@php.netIndex: sapi/apache2handler/config.m4 =================================================================== --- sapi/apache2handler/config.m4 (revision 323476) --- sapi/apache2handler/config.m4 (revision 323592) +++ sapi/apache2handler/config.m4 (working copy) @@ -38,7 +38,6 @@ APXS_BINDIR=`$APXS -q BINDIR` APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET` + if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then + PHP_BUILD_THREAD_SAFE + fi + else + MPM=`$APXS_HTTPD -M | grep mpm_prefork_module` + if test -z "$MPM"; then + 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) Index: sapi/apache2filter/config.m4 =================================================================== --- sapi/apache2filter/config.m4 (revision 323476) --- sapi/apache2filter/config.m4 (revision 323592) +++ sapi/apache2filter/config.m4 (working copy) @@ -39,7 +39,6 @@ APXS_BINDIR=`$APXS -q BINDIR` APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET` + if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then + PHP_BUILD_THREAD_SAFE + fi + else + MPM=`$APXS_HTTPD -M | grep mpm_prefork_module` + if test -z "$MPM"; then + 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) Index: configure.in =================================================================== --- configure.in (revision 323592) +++ configure.in (working copy) @@ -1550,6 +1550,21 @@ 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 |
Copyright © 2001-2024 The PHP Group All rights reserved. |
Last updated: Thu May 02 22:01:30 2024 UTC |