]> granicus.if.org Git - php/commitdiff
- Fixed bug #55486 (status show BIG processes number)
authorJérôme Loyet <fat@php.net>
Sat, 8 Oct 2011 19:50:26 +0000 (19:50 +0000)
committerJérôme Loyet <fat@php.net>
Sat, 8 Oct 2011 19:50:26 +0000 (19:50 +0000)
NEWS
sapi/fpm/fpm/fpm_process_ctl.c

diff --git a/NEWS b/NEWS
index 5937cc774a3513517abc4578062a8cd252b93c64..bcb7b27b6a04a3dca2df6a494e6d7310ddefacd3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -75,6 +75,7 @@ PHP                                                                        NEWS
   . 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).
index 5e7ca5d9003f3c2e0c85320354a836da3af18130..027b566bb221f19db342443217e406844c4b1728 100644 (file)
@@ -317,7 +317,7 @@ static void fpm_pctl_perform_idle_server_maintenance(struct timeval *now) /* {{{
                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 @@ static void fpm_pctl_perform_idle_server_maintenance(struct timeval *now) /* {{{
                                }
 #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 */