diff options
| author | Ondřej Surý <ondrej@sury.org> | 2012-04-06 14:37:49 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2012-04-06 14:37:49 +0200 |
| commit | 7b10b0041aa63c6f8990ceb3ccc190bdd9eea2b9 (patch) | |
| tree | 01edb9389d7b7f6b277a57e2bce1d05f9748d609 /sapi/apache2handler | |
| parent | 096b2f823b2273e3ee707b3805feb78d1e4be61d (diff) | |
| download | php-7b10b0041aa63c6f8990ceb3ccc190bdd9eea2b9.tar.gz | |
Imported Upstream version 5.4.1~rc1upstream/5.4.1_rc1
Diffstat (limited to 'sapi/apache2handler')
| -rw-r--r-- | sapi/apache2handler/apache_config.c | 2 | ||||
| -rw-r--r-- | sapi/apache2handler/config.m4 | 15 | ||||
| -rw-r--r-- | sapi/apache2handler/config.w32 | 2 | ||||
| -rw-r--r-- | sapi/apache2handler/mod_php5.c | 2 | ||||
| -rw-r--r-- | sapi/apache2handler/php_apache.h | 2 | ||||
| -rw-r--r-- | sapi/apache2handler/php_functions.c | 2 | ||||
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 2 |
7 files changed, 17 insertions, 10 deletions
diff --git a/sapi/apache2handler/apache_config.c b/sapi/apache2handler/apache_config.c index 2d221fe87..64ac93aa0 100644 --- a/sapi/apache2handler/apache_config.c +++ b/sapi/apache2handler/apache_config.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: apache_config.c 321634 2012-01-01 13:15:04Z felipe $ */ +/* $Id$ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 index 2cb3313f7..702f91f5d 100644 --- a/sapi/apache2handler/config.m4 +++ b/sapi/apache2handler/config.m4 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4 254930 2008-03-11 22:47:39Z lstrojny $ +dnl $Id$ dnl PHP_ARG_WITH(apxs2,, @@ -38,7 +38,6 @@ if test "$PHP_APXS2" != "no"; then 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 @@ if test "$PHP_APXS2" != "no"; then ;; 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) diff --git a/sapi/apache2handler/config.w32 b/sapi/apache2handler/config.w32 index 08fdae190..8d8a6c4b6 100644 --- a/sapi/apache2handler/config.w32 +++ b/sapi/apache2handler/config.w32 @@ -1,5 +1,5 @@ // vim:ft=javascript -// $Id: config.w32 313001 2011-07-06 11:13:38Z pajoye $ +// $Id$ ARG_ENABLE('apache2handler', 'Build Apache 2.x handler', 'no'); diff --git a/sapi/apache2handler/mod_php5.c b/sapi/apache2handler/mod_php5.c index 9884fc66b..9df4f2506 100644 --- a/sapi/apache2handler/mod_php5.c +++ b/sapi/apache2handler/mod_php5.c @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mod_php5.c 321634 2012-01-01 13:15:04Z felipe $ */ +/* $Id$ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h index 292919327..c43e722a5 100644 --- a/sapi/apache2handler/php_apache.h +++ b/sapi/apache2handler/php_apache.h @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_apache.h 321634 2012-01-01 13:15:04Z felipe $ */ +/* $Id$ */ #ifndef PHP_APACHE_H #define PHP_APACHE_H diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index df1585400..3c1f9a17f 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_functions.c 321634 2012-01-01 13:15:04Z felipe $ */ +/* $Id$ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 7112e022f..900a3a425 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c 321634 2012-01-01 13:15:04Z felipe $ */ +/* $Id$ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS |