- Fixed bug #52674 (FPM Status page returns inconsistent Content-Type headers).

diff --git a/NEWS b/NEWS
index f60387f93d1bb16c6b110a77f6c3dd85fcf29ea9..a50dd1b931a8f6b5e4ef95eb96e15a35ce7f38ef 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,8 @@
 - Changed the $context parameter on copy() to actually have an effect. (Kalle)
 - Fixed possible crash in mssql_fetch_batch(). (Kalle)
 
+- Fixed bug #52674 (FPM Status page returns inconsistent Content-Type headers).
+  (fat)
 - Fixed bug #52654 (mysqli doesn't install headers with structures it uses).
   (Andrey)
 - Fixed bug #52636 (php_mysql_fetch_hash writes long value into int). 

diff --git a/sapi/fpm/fpm/fpm_status.c b/sapi/fpm/fpm/fpm_status.c
index a9d30cf27378e48301d131d823b55da3876edd4b..50efaf8df1272f21c81ee51d429e822173eaef50 100644 (file)
--- a/sapi/fpm/fpm/fpm_status.c
+++ b/sapi/fpm/fpm/fpm_status.c
@@ -138,7 +138,7 @@ static void fpm_status_handle_status_txt(struct fpm_status_s *status, char **out
                "total processes:  %d\n",
                status->accepted_conn, fpm_status_pool, status->pm == PM_STYLE_STATIC ? "static" : "dynamic", status->idle, status->active, status->total);
 
-       spprintf(content_type, 0, "text/plain");
+       spprintf(content_type, 0, "Content-Type: text/plain");
 }
 /* }}} */
 
@@ -159,7 +159,7 @@ static void fpm_status_handle_status_html(struct fpm_status_s *status, char **ou
                "</table>",
                status->accepted_conn, fpm_status_pool, status->pm == PM_STYLE_STATIC ? "static" : "dynamic", status->idle, status->active, status->total);
 
-       spprintf(content_type, 0, "text/html");
+       spprintf(content_type, 0, "Content-Type: text/html");
 }
 /* }}} */
 
@@ -180,7 +180,7 @@ static void fpm_status_handle_status_json(struct fpm_status_s *status, char **ou
                "}",
                status->accepted_conn, fpm_status_pool, status->pm == PM_STYLE_STATIC ? "static" : "dynamic", status->idle, status->active, status->total);
 
-       spprintf(content_type, 0, "application/jsonrequest");
+       spprintf(content_type, 0, "Content-Type: application/json");
 }
 /* }}} */