Skip to content

Commit edb173c

Browse files
committed
Merge branch 'PHP-8.0' into PHP-8.1
2 parents 82d3ad6 + 3040f75 commit edb173c

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ PHP NEWS
2222
- FPM:
2323
. Fixed zlog message prepend, free on incorrect address. (Heiko Weber)
2424
. Fixed possible double free on configuration loading failure. (Heiko Weber).
25+
. Fixed on fpm scoreboard occasional warning on acquisition failure.
26+
(Felix Wiedemann)
2527

2628
- GD:
2729
. Fixed bug GH-8848 (imagecopyresized() error refers to the wrong argument).

sapi/fpm/fpm/fpm_request.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ void fpm_request_check_timed_out(struct fpm_child_s *child, struct timeval *now,
231231

232232
proc_p = fpm_scoreboard_proc_acquire(child->wp->scoreboard, child->scoreboard_i, 1);
233233
if (!proc_p) {
234-
zlog(ZLOG_WARNING, "failed to acquire scoreboard");
234+
zlog(ZLOG_NOTICE, "failed to acquire scoreboard");
235235
return;
236236
}
237237

0 commit comments

Comments
 (0)