fat Sat, 08 Oct 2011 19:31:32 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=317913
Log: - Fixed bug #55577 (status.html does not install) Bug: https://bugs.php.net/55577 (Analyzed) status.html does not install Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/sapi/fpm/config.m4 U php/php-src/branches/PHP_5_4/sapi/fpm/config.m4 U php/php-src/trunk/sapi/fpm/config.m4 Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2011-10-08 15:32:12 UTC (rev 317912) +++ php/php-src/branches/PHP_5_3/NEWS 2011-10-08 19:31:32 UTC (rev 317913) @@ -75,6 +75,7 @@ . Fixed bug #53872 (internal corruption of phar). (Hannes) - PHP-FPM SAPI: + . Fixed bug #55577 (status.html does not install). (fat) . Backported from 5.4 branch (Dropped restriction of not setting the same value multiple times, the last one holds). (giovanni at giacobbi dot net, fat) Modified: php/php-src/branches/PHP_5_3/sapi/fpm/config.m4 =================================================================== --- php/php-src/branches/PHP_5_3/sapi/fpm/config.m4 2011-10-08 15:32:12 UTC (rev 317912) +++ php/php-src/branches/PHP_5_3/sapi/fpm/config.m4 2011-10-08 19:31:32 UTC (rev 317913) @@ -411,7 +411,7 @@ AC_DEFINE_UNQUOTED(PHP_FPM_USER, "$php_fpm_user", [fpm user name]) AC_DEFINE_UNQUOTED(PHP_FPM_GROUP, "$php_fpm_group", [fpm group name]) - PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.8) + PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.8 sapi/fpm/status.html) PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag], [$abs_srcdir/sapi/fpm], [sapi/fpm]) SAPI_FPM_PATH=sapi/fpm/php-fpm Modified: php/php-src/branches/PHP_5_4/sapi/fpm/config.m4 =================================================================== --- php/php-src/branches/PHP_5_4/sapi/fpm/config.m4 2011-10-08 15:32:12 UTC (rev 317912) +++ php/php-src/branches/PHP_5_4/sapi/fpm/config.m4 2011-10-08 19:31:32 UTC (rev 317913) @@ -412,7 +412,7 @@ AC_DEFINE_UNQUOTED(PHP_FPM_GROUP, "$php_fpm_group", [fpm group name]) PHP_ADD_BUILD_DIR(sapi/fpm/fpm) - PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.8) + PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.8 sapi/fpm/status.html) PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag]) SAPI_FPM_PATH=sapi/fpm/php-fpm Modified: php/php-src/trunk/sapi/fpm/config.m4 =================================================================== --- php/php-src/trunk/sapi/fpm/config.m4 2011-10-08 15:32:12 UTC (rev 317912) +++ php/php-src/trunk/sapi/fpm/config.m4 2011-10-08 19:31:32 UTC (rev 317913) @@ -412,7 +412,7 @@ AC_DEFINE_UNQUOTED(PHP_FPM_GROUP, "$php_fpm_group", [fpm group name]) PHP_ADD_BUILD_DIR(sapi/fpm/fpm) - PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.8) + PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.8 sapi/fpm/status.html) PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag]) SAPI_FPM_PATH=sapi/fpm/php-fpm
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
