From 2a5b2cca858adb42ef659b8ec033b3a41f329c66 Mon Sep 17 00:00:00 2001 From: David CARLIER Date: Mon, 18 Jul 2022 14:21:07 +0100 Subject: [PATCH 1/2] Revert "FPM: Downgrade occasional "failed to acquire scoreboard" warning" This reverts commit 3040f75f434f64756655faba9d1eaaa76e4babb0. --- NEWS | 2 -- sapi/fpm/fpm/fpm_request.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 73f0d5f37a6..f9632c86d90 100644 --- a/NEWS +++ b/NEWS @@ -22,8 +22,6 @@ PHP NEWS - FPM: . Fixed zlog message prepend, free on incorrect address. (Heiko Weber) . Fixed possible double free on configuration loading failure. (Heiko Weber). - . Fixed on fpm scoreboard occasional warning on acquisition failure. - (Felix Wiedemann) - GD: . Fixed bug GH-8848 (imagecopyresized() error refers to the wrong argument). diff --git a/sapi/fpm/fpm/fpm_request.c b/sapi/fpm/fpm/fpm_request.c index 47ebe8e16a5..4f51824138d 100644 --- a/sapi/fpm/fpm/fpm_request.c +++ b/sapi/fpm/fpm/fpm_request.c @@ -231,7 +231,7 @@ void fpm_request_check_timed_out(struct fpm_child_s *child, struct timeval *now, proc_p = fpm_scoreboard_proc_acquire(child->wp->scoreboard, child->scoreboard_i, 1); if (!proc_p) { - zlog(ZLOG_NOTICE, "failed to acquire scoreboard"); + zlog(ZLOG_WARNING, "failed to acquire scoreboard"); return; } From a670d2be74247197fdf4f03e82b04e73b6451fea Mon Sep 17 00:00:00 2001 From: Gabriel Caruso Date: Tue, 19 Jul 2022 10:31:08 +0200 Subject: [PATCH 2/2] Prepare for PHP 8.0.23 --- NEWS | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index f9632c86d90..3aa7124acd2 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2022, PHP 8.0.22 +?? ??? 2022, PHP 8.0.23 + + +04 Aug 2022, PHP 8.0.22 - CLI: . Fixed potential overflow for the builtin server via the PHP_CLI_SERVER_WORKERS