mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2' into PHP-8.3

Browse Source
This commit is contained in:
Jakub Zelenka 2023-12-01 14:47:57 +00:00
commit c74fc4c5b0
No known key found for this signature in database
GPG Key ID: 1C0779DC5C0A9DE4
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -7,6 +7,10 @@ PHP NEWS
ZEND_FUNC_GET_ARGS and ZEND_BIND_STATIC). (Florian Engelhardt)
. Fix various missing NULL checks. (nielsdos, dstogov)
- FPM:
. Fixed bug GH-12705 (Segmentation fault in fpm_status_export_to_zval).
(Patrick Prasse)
- LibXML:
. Fixed test failures for libxml2 2.12.0. (nielsdos)

2
sapi/fpm/fpm/fpm_status.c
View File

@ -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;
}