Skip to content

Commit 2303e76

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
2 parents 1e55c97 + df259f8 commit 2303e76

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ PHP NEWS
1919
. Fixed bug GH-12616 (DOM: Removing XMLNS namespace node results in invalid
2020
default: prefix). (nielsdos)
2121

22+
- FPM:
23+
. Fixed bug GH-12705 (Segmentation fault in fpm_status_export_to_zval).
24+
(Patrick Prasse)
25+
2226
- Intl:
2327
. Fixed bug GH-12635 (Test bug69398.phpt fails with ICU 74.1). (nielsdos)
2428

sapi/fpm/fpm/fpm_status.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ int fpm_status_export_to_zval(zval *status)
5656

5757
scoreboard_p = fpm_scoreboard_acquire(NULL, 1);
5858
if (!scoreboard_p) {
59-
zlog(ZLOG_NOTICE, "[pool %s] status: scoreboard already in use.", scoreboard_p->pool);
59+
zlog(ZLOG_NOTICE, "[pool (unknown)] status: scoreboard already in use.");
6060
return -1;
6161
}
6262

0 commit comments

Comments
 (0)