php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01: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
2024-05-12 13:32:56 +01:00
parent 12ef6cc5a6 5b6cda6523
commit 7f8ffbc813
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -23,6 +23,10 @@ PHP NEWS
. Fix crash in ParentNode::append() when dealing with a fragment . Fix crash in ParentNode::append() when dealing with a fragment
containing text nodes. (nielsdos) containing text nodes. (nielsdos)
- FPM:
. Fix bug GH-14175 (Show decimal number instead of scientific notation in
systemd status). (Benjamin Cremer)
- Hash: - Hash:
. ext/hash: Swap the checking order of `__has_builtin` and `__GNUC__` . ext/hash: Swap the checking order of `__has_builtin` and `__GNUC__`
(Saki Takamachi) (Saki Takamachi)

4
sapi/fpm/fpm/fpm_systemd.c
View File

@@ -29,13 +29,13 @@ static void fpm_systemd(void)
} }
/* /*
zlog(ZLOG_DEBUG, "systemd %s (Processes active:%d, idle:%d, Requests:%lu, slow:%lu, Traffic:%.3greq/sec)", zlog(ZLOG_DEBUG, "systemd %s (Processes active:%d, idle:%d, Requests:%lu, slow:%lu, Traffic:%.2freq/sec)",
fpm_global_config.systemd_watchdog ? "watchdog" : "heartbeat", fpm_global_config.systemd_watchdog ? "watchdog" : "heartbeat",
active, idle, requests, slow_req, ((float)requests - last) * 1000.0 / fpm_global_config.systemd_interval); active, idle, requests, slow_req, ((float)requests - last) * 1000.0 / fpm_global_config.systemd_interval);
*/ */
if (0 > sd_notifyf(0, "READY=1\n%s" if (0 > sd_notifyf(0, "READY=1\n%s"
"STATUS=Processes active: %d, idle: %d, Requests: %lu, slow: %lu, Traffic: %.3greq/sec", "STATUS=Processes active: %d, idle: %d, Requests: %lu, slow: %lu, Traffic: %.2freq/sec",
fpm_global_config.systemd_watchdog ? "WATCHDOG=1\n" : "", fpm_global_config.systemd_watchdog ? "WATCHDOG=1\n" : "",
active, idle, requests, slow_req, ((float)requests - last) * 1000.0 / fpm_global_config.systemd_interval)) { active, idle, requests, slow_req, ((float)requests - last) * 1000.0 / fpm_global_config.systemd_interval)) {
zlog(ZLOG_NOTICE, "failed to notify status to systemd"); zlog(ZLOG_NOTICE, "failed to notify status to systemd");