fat Sat, 08 Oct 2011 19:50:26 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=317915
Log: - Fixed bug #55486 (status show BIG processes number) Bug: https://bugs.php.net/55486 (Analyzed) status show BIG processes number Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_process_ctl.c U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_process_ctl.c U php/php-src/trunk/sapi/fpm/fpm/fpm_process_ctl.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2011-10-08 19:35:56 UTC (rev 317914) +++ php/php-src/branches/PHP_5_3/NEWS 2011-10-08 19:50:26 UTC (rev 317915) @@ -75,6 +75,7 @@ . Fixed bug #53872 (internal corruption of phar). (Hannes) - PHP-FPM SAPI: + . Fixed bug #55486 (status show BIG processes number). (fat) . 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). Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_process_ctl.c =================================================================== --- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_process_ctl.c 2011-10-08 19:35:56 UTC (rev 317914) +++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_process_ctl.c 2011-10-08 19:50:26 UTC (rev 317915) @@ -317,7 +317,7 @@ int idle = 0; int active = 0; int children_to_fork; - unsigned cur_lq; + unsigned cur_lq = 0; if (wp->config == NULL) continue; @@ -352,8 +352,8 @@ } #endif } - fpm_scoreboard_update(idle, active, cur_lq, -1, -1, -1, FPM_SCOREBOARD_ACTION_SET, wp->scoreboard); } + fpm_scoreboard_update(idle, active, cur_lq, -1, -1, -1, FPM_SCOREBOARD_ACTION_SET, wp->scoreboard); /* the rest is only used by PM_STYLE_DYNAMIC */ Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_process_ctl.c =================================================================== --- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_process_ctl.c 2011-10-08 19:35:56 UTC (rev 317914) +++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_process_ctl.c 2011-10-08 19:50:26 UTC (rev 317915) @@ -317,7 +317,7 @@ int idle = 0; int active = 0; int children_to_fork; - unsigned cur_lq; + unsigned cur_lq = 0; if (wp->config == NULL) continue; @@ -352,8 +352,8 @@ } #endif } - fpm_scoreboard_update(idle, active, cur_lq, -1, -1, -1, FPM_SCOREBOARD_ACTION_SET, wp->scoreboard); } + fpm_scoreboard_update(idle, active, cur_lq, -1, -1, -1, FPM_SCOREBOARD_ACTION_SET, wp->scoreboard); /* the rest is only used by PM_STYLE_DYNAMIC */ Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_process_ctl.c =================================================================== --- php/php-src/trunk/sapi/fpm/fpm/fpm_process_ctl.c 2011-10-08 19:35:56 UTC (rev 317914) +++ php/php-src/trunk/sapi/fpm/fpm/fpm_process_ctl.c 2011-10-08 19:50:26 UTC (rev 317915) @@ -317,7 +317,7 @@ int idle = 0; int active = 0; int children_to_fork; - unsigned cur_lq; + unsigned cur_lq = 0; if (wp->config == NULL) continue; @@ -352,8 +352,8 @@ } #endif } - fpm_scoreboard_update(idle, active, cur_lq, -1, -1, -1, FPM_SCOREBOARD_ACTION_SET, wp->scoreboard); } + fpm_scoreboard_update(idle, active, cur_lq, -1, -1, -1, FPM_SCOREBOARD_ACTION_SET, wp->scoreboard); /* the rest is only used by PM_STYLE_DYNAMIC */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
