Merge branch 'master' of https://github.com/guggemand/php-src

* 'master' of https://github.com/guggemand/php-src:
  Dont reset other counters when incrementing slow_rq

Author: m6w6

sapi/fpm/fpm/fpm_php_trace.c

@@ -138,7 +138,7 @@ static int fpm_php_trace_dump(struct fpm_child_s *child, FILE *slowlog TSRMLS_DC
 void fpm_php_trace(struct fpm_child_s *child) /* {{{ */
 {
 	TSRMLS_FETCH();
-	fpm_scoreboard_update(0, 0, 0, 0, 0, 0, 1, FPM_SCOREBOARD_ACTION_SET, child->wp->scoreboard);
+	fpm_scoreboard_update(0, 0, 0, 0, 0, 0, 1, FPM_SCOREBOARD_ACTION_INC, child->wp->scoreboard);
 	FILE *slowlog;
 
 	zlog(ZLOG_NOTICE, "about to trace %d", (int) child->pid);

sapi/fpm/fpm/fpm_scoreboard.c

@@ -111,7 +111,7 @@ void fpm_scoreboard_update(int idle, int active, int lq, int lq_len, int request
 			scoreboard->max_children_reached = max_children_reached;
 		}
 		if (slow_rq > 0) {
-			scoreboard->slow_rq += slow_rq;
+			scoreboard->slow_rq = slow_rq;
 		}
 	} else {
 		if (scoreboard->idle + idle > 0) {
@@ -137,6 +137,12 @@ void fpm_scoreboard_update(int idle, int active, int lq, int lq_len, int request
 		} else {
 			scoreboard->max_children_reached = 0;
 		}
+
+		if (scoreboard->slow_rq + slow_rq > 0) {
+			scoreboard->slow_rq += slow_rq;
+		} else {
+			scoreboard->slow_rq = 0;
+		}
 	}
 
 	if (scoreboard->active > scoreboard->active_max) {