cvs: php-src(PHP_5_3) /sapi/apache2filter config.m4 /sapi/apache2handler config.m4

lstrojny Tue Mar 11 22:47:40 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/sapi/apache2filter config.m4 /php-src/sapi/apache2handler config.m4 Log: Adding itk again to non-threaded MPMs. Sorry for the confusion http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/config.m4?r1=1.47&r2=1.48&diff_format=u Index: php-src/sapi/apache2filter/config.m4 diff -u php-src/sapi/apache2filter/config.m4:1.47 php-src/sapi/apache2filter/config.m4:1.48 --- php-src/sapi/apache2filter/config.m4:1.47 Sun Mar 9 12:37:05 2008 +++ php-src/sapi/apache2filter/config.m4 Tue Mar 11 22:47:39 2008 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.47 2008/03/09 12:37:05 lstrojny Exp $ +dnl $Id: config.m4,v 1.48 2008/03/11 22:47:39 lstrojny Exp $ dnl PHP_ARG_WITH(apxs2filter,, @@ -118,7 +118,7 @@ ;; esac - if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser"; then + if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then PHP_BUILD_THREAD_SAFE fi AC_MSG_RESULT(yes) http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/config.m4?r1=1.14.2.1.2.2.2.2&r2=1.14.2.1.2.2.2.3&diff_format=u Index: php-src/sapi/apache2handler/config.m4 diff -u php-src/sapi/apache2handler/config.m4:1.14.2.1.2.2.2.2 php-src/sapi/apache2handler/config.m4:1.14.2.1.2.2.2.3 --- php-src/sapi/apache2handler/config.m4:1.14.2.1.2.2.2.2 Sun Mar 9 12:35:56 2008 +++ php-src/sapi/apache2handler/config.m4 Tue Mar 11 22:47:39 2008 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.14.2.1.2.2.2.2 2008/03/09 12:35:56 lstrojny Exp $ +dnl $Id: config.m4,v 1.14.2.1.2.2.2.3 2008/03/11 22:47:39 lstrojny Exp $ dnl PHP_ARG_WITH(apxs2,, @@ -117,7 +117,7 @@ ;; esac - if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser"; then + if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then PHP_BUILD_THREAD_SAFE fi AC_MSG_RESULT(yes)