28 lines
776 B
Diff
28 lines
776 B
Diff
|
Disable MPM detection
|
||
|
|
|
||
|
|
mod_php is build twice
|
||
|
|
- as NTS without option
|
||
|
|
- as ZTS using --enable-maintainer-zts
|
||
|
|
|
||
|
|
diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
|
||
|
|
--- a/sapi/apache2handler/config.m4
|
||
|
|
+++ b/sapi/apache2handler/config.m4
|
||
|
|
@@ -105,17 +105,6 @@ if test "$PHP_APXS2" != "no"; then
|
||
|
|
;;
|
||
|
|
esac
|
||
|
|
|
||
|
|
- 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 2>/dev/null | grep 'threaded:.*yes'`
|
||
|
|
- if test -n "$APACHE_THREADED_MPM"; then
|
||
|
|
- PHP_BUILD_THREAD_SAFE
|
||
|
|
- fi
|
||
|
|
- fi
|
||
|
|
AC_MSG_RESULT(yes)
|
||
|
|
PHP_SUBST(APXS)
|
||
|
|
else
|