From: Jérôme Loyet <fat@php.net>
Date: Sat, 8 Oct 2011 19:50:26 +0000 (+0000)
Subject: - Fixed bug #55486 (status show BIG processes number)
X-Git-Tag: php-5.3.9RC1~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c2752169cec433190131d5d48e4a47539a2af9b;p=php

- Fixed bug #55486 (status show BIG processes number)
---

diff --git a/NEWS b/NEWS
index 5937cc774a..bcb7b27b6a 100644
--- 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).
diff --git a/sapi/fpm/fpm/fpm_process_ctl.c b/sapi/fpm/fpm/fpm_process_ctl.c
index 5e7ca5d900..027b566bb2 100644
--- a/sapi/fpm/fpm/fpm_process_ctl.c
+++ b/sapi/fpm/fpm/fpm_process_ctl.c
@@ -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 */