diff --git a/NEWS b/NEWS index 83931190930..28d380f3592 100644 --- a/NEWS +++ b/NEWS @@ -23,6 +23,10 @@ PHP NEWS - Filter: . Fixed FILTER_FLAG_NO_RES_RANGE flag. (Yifan Tong) +- FPM: + . Fixed bug GH-7842 (Invalid OpenMetrics response format returned by FPM + status page. (Stefano Arlandini) + - Hash: . Fixed bug GH-7759 (Incorrect return types for hash() and hash_hmac()). (cmb) diff --git a/sapi/fpm/fpm/fpm_status.c b/sapi/fpm/fpm/fpm_status.c index b086566cc54..24ac8afdc94 100644 --- a/sapi/fpm/fpm/fpm_status.c +++ b/sapi/fpm/fpm/fpm_status.c @@ -430,7 +430,8 @@ int fpm_status_handle_request(void) /* {{{ */ "phpfpm_max_children_reached %u\n" "# HELP phpfpm_slow_requests The number of requests that exceeded your 'request_slowlog_timeout' value.\n" "# TYPE phpfpm_slow_requests counter\n" - "phpfpm_slow_requests %lu\n"; + "phpfpm_slow_requests %lu\n" + "# EOF\n"; has_start_time = 0; if (!full) { diff --git a/sapi/fpm/tests/status.inc b/sapi/fpm/tests/status.inc index c8275567665..0e3f314b422 100644 --- a/sapi/fpm/tests/status.inc +++ b/sapi/fpm/tests/status.inc @@ -241,7 +241,8 @@ class Status "phpfpm_max_children_reached " . $fields['max children reached'] . "\n" . "# HELP phpfpm_slow_requests The number of requests that exceeded your 'request_slowlog_timeout' value\.\n" . "# TYPE phpfpm_slow_requests counter\n" . - "phpfpm_slow_requests " . $fields['slow requests'] . ")"; + "phpfpm_slow_requests " . $fields['slow requests'] . "\n" . + "# EOF)\n"; if (!preg_match($pattern, $body)) { echo "ERROR: Expected body does not match pattern\n";