Skip to content

Commit c70f3e0

Browse files
committed
Merge branch 'PHP-8.1'
2 parents e1a2383 + 46bec6d commit c70f3e0

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

sapi/fpm/fpm/fpm_status.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,8 @@ int fpm_status_handle_request(void) /* {{{ */
430430
"phpfpm_max_children_reached %u\n"
431431
"# HELP phpfpm_slow_requests The number of requests that exceeded your 'request_slowlog_timeout' value.\n"
432432
"# TYPE phpfpm_slow_requests counter\n"
433-
"phpfpm_slow_requests %lu\n";
433+
"phpfpm_slow_requests %lu\n"
434+
"# EOF\n";
434435

435436
has_start_time = 0;
436437
if (!full) {

sapi/fpm/tests/status.inc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,8 @@ class Status
241241
"phpfpm_max_children_reached " . $fields['max children reached'] . "\n" .
242242
"# HELP phpfpm_slow_requests The number of requests that exceeded your 'request_slowlog_timeout' value\.\n" .
243243
"# TYPE phpfpm_slow_requests counter\n" .
244-
"phpfpm_slow_requests " . $fields['slow requests'] . ")";
244+
"phpfpm_slow_requests " . $fields['slow requests'] . "\n" .
245+
"# EOF)\n";
245246

246247
if (!preg_match($pattern, $body)) {
247248
echo "ERROR: Expected body does not match pattern\n";

0 commit comments

Comments
 (0)