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.3' into PHP-8.4

Browse Source
This commit is contained in:
Jakub Zelenka
2025-05-30 22:57:34 +02:00
parent e44c13cffe 48b492269b
commit 39efe8ac1e
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -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)

1
sapi/fpm/fpm/fpm_request.c
View File

@@ -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",

3
sapi/fpm/fpm/fpm_request.h
View File

@@ -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,