mirror of
https://github.com/php/php-src.git
synced 2024-11-27 11:53:33 +08:00
Merge branch 'PHP-8.1' into PHP-8.2
This commit is contained in:
commit
2303e76740
4
NEWS
4
NEWS
@ -19,6 +19,10 @@ PHP NEWS
|
||||
. Fixed bug GH-12616 (DOM: Removing XMLNS namespace node results in invalid
|
||||
default: prefix). (nielsdos)
|
||||
|
||||
- FPM:
|
||||
. Fixed bug GH-12705 (Segmentation fault in fpm_status_export_to_zval).
|
||||
(Patrick Prasse)
|
||||
|
||||
- Intl:
|
||||
. Fixed bug GH-12635 (Test bug69398.phpt fails with ICU 74.1). (nielsdos)
|
||||
|
||||
|
@ -56,7 +56,7 @@ int fpm_status_export_to_zval(zval *status)
|
||||
|
||||
scoreboard_p = fpm_scoreboard_acquire(NULL, 1);
|
||||
if (!scoreboard_p) {
|
||||
zlog(ZLOG_NOTICE, "[pool %s] status: scoreboard already in use.", scoreboard_p->pool);
|
||||
zlog(ZLOG_NOTICE, "[pool (unknown)] status: scoreboard already in use.");
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user