Merge branch 'PHP-8.3' into PHP-8.4

Author: bukka

NEWS

@@ -16,6 +16,9 @@ PHP                                                                        NEWS
 - Date:
   . Fix leaks with multiple calls to DatePeriod iterator current(). (nielsdos)
 
+- FPM:
+  . Fixed GH-18662 (fpm_get_status segfault). (txuna)
+
 - Intl:
   . Fix memory leak in intl_datetime_decompose() on failure. (nielsdos)
 

sapi/fpm/fpm/fpm_request.c

@@ -22,6 +22,7 @@
 #include "zlog.h"
 
 static const char *requests_stages[] = {
+	[FPM_REQUEST_CREATING]        = "Creating",
 	[FPM_REQUEST_ACCEPTING]       = "Idle",
 	[FPM_REQUEST_READING_HEADERS] = "Reading headers",
 	[FPM_REQUEST_INFO]            = "Getting request information",

sapi/fpm/fpm/fpm_request.h

@@ -25,7 +25,8 @@ const char *fpm_request_get_stage_name(int stage);
 int fpm_request_last_activity(struct fpm_child_s *child, struct timeval *tv);
 
 enum fpm_request_stage_e {
-	FPM_REQUEST_ACCEPTING = 1,
+	FPM_REQUEST_CREATING,
+	FPM_REQUEST_ACCEPTING,
 	FPM_REQUEST_READING_HEADERS,
 	FPM_REQUEST_INFO,
 	FPM_REQUEST_EXECUTING,