sixd Fri, 02 Mar 2012 00:07:41 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=323750
Log:
Fixed bug #61172 (Add Apache 2.4 support)
Bug: https://bugs.php.net/61172 (Open) With Apache 2.4.1, ./configure fails on
APXS but stops only on the MySQL check.
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/configure.in
U php/php-src/branches/PHP_5_3/sapi/apache2filter/config.m4
U php/php-src/branches/PHP_5_3/sapi/apache2handler/config.m4
U php/php-src/branches/PHP_5_4/NEWS
U php/php-src/branches/PHP_5_4/configure.in
U php/php-src/branches/PHP_5_4/sapi/apache2filter/config.m4
U php/php-src/branches/PHP_5_4/sapi/apache2handler/config.m4
U php/php-src/trunk/configure.in
U php/php-src/trunk/sapi/apache2filter/config.m4
U php/php-src/trunk/sapi/apache2handler/config.m4
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2012-03-01 23:58:16 UTC (rev 323749)
+++ php/php-src/branches/PHP_5_3/NEWS 2012-03-02 00:07:41 UTC (rev 323750)
@@ -22,6 +22,9 @@
(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)
Modified: php/php-src/branches/PHP_5_3/configure.in
===================================================================
--- php/php-src/branches/PHP_5_3/configure.in 2012-03-01 23:58:16 UTC (rev 323749)
+++ php/php-src/branches/PHP_5_3/configure.in 2012-03-02 00:07:41 UTC (rev 323750)
@@ -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
Modified: php/php-src/branches/PHP_5_3/sapi/apache2filter/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/apache2filter/config.m4 2012-03-01 23:58:16 UTC (rev 323749)
+++ php/php-src/branches/PHP_5_3/sapi/apache2filter/config.m4 2012-03-02 00:07:41 UTC (rev 323750)
@@ -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
+ 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)
Modified: php/php-src/branches/PHP_5_3/sapi/apache2handler/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/apache2handler/config.m4 2012-03-01 23:58:16 UTC (rev 323749)
+++ php/php-src/branches/PHP_5_3/sapi/apache2handler/config.m4 2012-03-02 00:07:41 UTC (rev 323750)
@@ -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
+ 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)
Modified: php/php-src/branches/PHP_5_4/NEWS
===================================================================
--- php/php-src/branches/PHP_5_4/NEWS 2012-03-01 23:58:16 UTC (rev 323749)
+++ php/php-src/branches/PHP_5_4/NEWS 2012-03-02 00:07:41 UTC (rev 323750)
@@ -6,6 +6,9 @@
. Fixed memory leak in substr_replace. (Pierrick)
. make max_file_uploads ini directive settable outside of php.ini (Rasmus)
+- Installation
+ . Fixed bug #61172 (Add Apache 2.4 support). (Chris Jones)
+
01 Mar 2012, PHP 5.4.0
- Installation:
Modified: php/php-src/branches/PHP_5_4/configure.in
===================================================================
--- php/php-src/branches/PHP_5_4/configure.in 2012-03-01 23:58:16 UTC (rev 323749)
+++ php/php-src/branches/PHP_5_4/configure.in 2012-03-02 00:07:41 UTC (rev 323750)
@@ -1587,6 +1587,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
Modified: php/php-src/branches/PHP_5_4/sapi/apache2filter/config.m4
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/apache2filter/config.m4 2012-03-01 23:58:16 UTC (rev 323749)
+++ php/php-src/branches/PHP_5_4/sapi/apache2filter/config.m4 2012-03-02 00:07:41 UTC (rev 323750)
@@ -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
+ 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)
Modified: php/php-src/branches/PHP_5_4/sapi/apache2handler/config.m4
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/apache2handler/config.m4 2012-03-01 23:58:16 UTC (rev 323749)
+++ php/php-src/branches/PHP_5_4/sapi/apache2handler/config.m4 2012-03-02 00:07:41 UTC (rev 323750)
@@ -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
+ 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)
Modified: php/php-src/trunk/configure.in
===================================================================
--- php/php-src/trunk/configure.in 2012-03-01 23:58:16 UTC (rev 323749)
+++ php/php-src/trunk/configure.in 2012-03-02 00:07:41 UTC (rev 323750)
@@ -1587,6 +1587,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
Modified: php/php-src/trunk/sapi/apache2filter/config.m4
===================================================================
--- php/php-src/trunk/sapi/apache2filter/config.m4 2012-03-01 23:58:16 UTC (rev 323749)
+++ php/php-src/trunk/sapi/apache2filter/config.m4 2012-03-02 00:07:41 UTC (rev 323750)
@@ -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
+ 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)
Modified: php/php-src/trunk/sapi/apache2handler/config.m4
===================================================================
--- php/php-src/trunk/sapi/apache2handler/config.m4 2012-03-01 23:58:16 UTC (rev 323749)
+++ php/php-src/trunk/sapi/apache2handler/config.m4 2012-03-02 00:07:41 UTC (rev 323750)
@@ -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
+ 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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
