php.net |  support |  documentation |  report a bug |  advanced search |  search howto |  statistics |  random bug |  login
Return to Bug #61172
Patch bug61172.patch.txt revision 2012-02-28 22:57 UTC by sixd@php.net
revision 2012-02-24 19:20 UTC by sixd@php.net
revision 2012-02-24 00:44 UTC by sixd@php.net

Patch bug61172.patch.txt for Compile Failure Bug #61172

Patch version 2012-02-24 00:44 UTC

Return to Bug #61172 | Download this patch
This patch is obsolete

Obsoleted by patches:

Patch Revisions: 2012-02-28 22:57 UTC | 2012-02-24 19:20 UTC | 2012-02-24 00:44 UTC

Developer: sixd@php.net



  Index: sapi/apache2handler/config.m4
  ===================================================================
 --- sapi/apache2handler/config.m4	(revision 323476)
 --- sapi/apache2handler/config.m4	(revision 323452)
  +++ sapi/apache2handler/config.m4	(working copy)
  @@ -38,7 +38,6 @@
     APXS_BINDIR=`$APXS -q BINDIR`
     APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`


  -    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
 +  	  PHP_BUILD_THREAD_SAFE
 +  	fi
  +  else
 +    MPM=`$APXS_HTTPD -M | grep mpm_prefork_module`
 +    if test -z "$MPM"; then
 +      PHP_BUILD_THREAD_SAFE
 +    fi
 +    MPM=`$APXS_HTTPD -t -D DUMP_MODULES | grep mpm | grep prefork`
 +	if test -z "$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 323452)
  +++ sapi/apache2filter/config.m4	(working copy)
  @@ -39,7 +39,6 @@
     APXS_BINDIR=`$APXS -q BINDIR`
     APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`


  -    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
 +  	  PHP_BUILD_THREAD_SAFE
 +  	fi
  +  else
 +    MPM=`$APXS_HTTPD -M | grep mpm_prefork_module`
 +    if test -z "$MPM"; then
 +      PHP_BUILD_THREAD_SAFE
 +    fi
 +    MPM=`$APXS_HTTPD -t -D DUMP_MODULES | grep mpm | grep prefork`
 +	if test -z "$MPM"; then
 +  	  PHP_BUILD_THREAD_SAFE
 +	fi
     fi
     AC_MSG_RESULT(yes)
     PHP_SUBST(APXS)
 
PHP Copyright © 2001-2014 The PHP Group
All rights reserved.
Last updated: Thu Apr 17 09:02:29 2014 UTC