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

Patch version 2012-02-24 19:20 UTC

Obsoleted by patches:

• bug61172.patch.txt, revision 2012-02-28 22:57 UTC

Obsolete patches:

• bug61172.patch.txt, revision 2012-02-24 00:44 UTC

• 2012-02-28 22:57 UTC [diff to current]
• 2012-02-24 19:20 UTC [diff to current]
• 2012-02-24 00:44 UTC [diff to current]

Developer: sixd@php.net

Index: sapi/apache2handler/config.m4
===================================================================
--- sapi/apache2handler/config.m4	(revision 323476)
+++ sapi/apache2handler/config.m4	(working copy)
@@ -38,7 +38,6 @@
   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 @@
     ;;
   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
+    MPM=`$APXS_HTTPD -M | grep mpm_prefork_module`
+    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	(working copy)
@@ -39,7 +39,6 @@
   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 @@
     ;;
   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
+    MPM=`$APXS_HTTPD -M | grep mpm_prefork_module`
+    if test -z "$MPM"; then
+      PHP_BUILD_THREAD_SAFE
+    fi
   fi
   AC_MSG_RESULT(yes)
   PHP_SUBST(APXS)