From: Jérôme Loyet Date: Sat, 8 Oct 2011 19:31:32 +0000 (+0000) Subject: - Fixed bug #55577 (status.html does not install) X-Git-Tag: php-5.3.9RC1~48 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d554c45b93e0491f65a6a52b1dacac0ae54b69f;p=php - Fixed bug #55577 (status.html does not install) --- diff --git a/NEWS b/NEWS index 9f0b8d5212..5937cc774a 100644 --- a/NEWS +++ b/NEWS @@ -75,6 +75,7 @@ PHP NEWS . 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) diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4 index 1105ec8d28..064493c602 100644 --- a/sapi/fpm/config.m4 +++ b/sapi/fpm/config.m4 @@ -411,7 +411,7 @@ if test "$PHP_FPM" != "no"; then 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