diff options
| author | Lars Strojny <lstrojny@php.net> | 2008-03-09 01:10:25 +0000 |
|---|---|---|
| committer | Lars Strojny <lstrojny@php.net> | 2008-03-09 01:10:25 +0000 |
| commit | 1b16b4e24343a7e2cc07217ff678331c2b3f93df (patch) | |
| tree | 73f39705de1d8f07d8f5fe0c3a47d12071c915de | |
| parent | 14496417d0fe048b0b50ad8336a62b473374e5cb (diff) | |
| download | php-git-1b16b4e24343a7e2cc07217ff678331c2b3f93df.tar.gz | |
Adding itk and and peruser MPM to the list of threaded Apache MPMs
| -rw-r--r-- | sapi/apache2filter/config.m4 | 4 | ||||
| -rw-r--r-- | sapi/apache2handler/config.m4 | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4 index 148799ca61..e4c7de2063 100644 --- a/sapi/apache2filter/config.m4 +++ b/sapi/apache2filter/config.m4 @@ -110,7 +110,7 @@ if test "$PHP_APXS2FILTER" != "no"; then `ln -s $APXS_BINDIR/httpd _APP_` EXTRA_LIBS="$EXTRA_LIBS _APP_" PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) - INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" + INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" ;; *) PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) @@ -118,7 +118,7 @@ if test "$PHP_APXS2FILTER" != "no"; then ;; esac - if test "$APXS_MPM" != "prefork"; then + if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then PHP_BUILD_THREAD_SAFE fi AC_MSG_RESULT(yes) diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 index 8bc677b4cc..95217908fd 100644 --- a/sapi/apache2handler/config.m4 +++ b/sapi/apache2handler/config.m4 @@ -109,7 +109,7 @@ if test "$PHP_APXS2" != "no"; then `ln -s $APXS_BINDIR/httpd _APP_` EXTRA_LIBS="$EXTRA_LIBS _APP_" PHP_SELECT_SAPI(apache2handler, shared, mod_php5.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) - INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" + INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" ;; *) PHP_SELECT_SAPI(apache2handler, shared, mod_php5.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) @@ -117,7 +117,7 @@ if test "$PHP_APXS2" != "no"; then ;; esac - if test "$APXS_MPM" != "prefork"; then + if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then PHP_BUILD_THREAD_SAFE fi AC_MSG_RESULT(yes) |