Commit 2191a188687 for php
commit 2191a188687f7b7d52a25edfe701a3f89c1cfc82
Merge: e5f75febc8e 7db31fe7d84
Author: Jakub Zelenka <bukka@php.net>
Date: Thu Nov 19 16:09:27 2026 +0100
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
PHP-8.2 is now for PHP 8.2.37-dev
Add NEWS entries
Fix GHSA-jm4m-qfqx-967m: FPM worker stdio pipe fd closed twice
Fix GHSA-mmf9-xm3v-hg2x: quadratic folded header concatenation
Fix GHSA-f6gg-rchx-xw8j: mixed case HTTPS and FTPS
Fix GHSA-658j-r8rw-q6mx: session.upload_progress.enabled is off by default
Fix GHSA-fm2m-fjf5-v3cp: RCE via corrupted session file
Fix GHSA-gr4f-wgx5-jpfv: DATEG(tzcache) use-after-free
Fix GHSA-4646-p932-gw34: keep SOAP DTD alive during cleanup
Fix GHSA-qc49-hpvq-g2w6: Drain unread request bodies
Fix GHSA-3mg3-cr28-46gc: FPM XSS within status endpoint via user and script
Fix GHSA-5j3f-64r7-f564: PATH_INFO underflow in CGI init_request_info()
Fix GHSA-68fq-fh7h-f8gr: refuse keyless phar signature when .pubkey exists
Fix GHSA-q23r-hr55-xmpg: out-of-bounds read on empty SOAP-ENC:arraySize
# Conflicts:
# NEWS
# Zend/zend.h
# configure.ac
# ext/standard/http_fopen_wrapper.c
# ext/zend_test/test.c
# main/php_version.h
# sapi/fpm/fpm/fpm_status.c
diff --cc NEWS
index 91bd9fa4a64,c01a3436660..91c13b1c24d
--- a/NEWS
+++ b/NEWS
@@@ -1,10 -1,50 +1,49 @@@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 8.2.37
-
-
-19 Nov 2026, PHP 8.2.36
+?? ??? ????, PHP 8.3.37
+ - CGI:
+ . Fixed GHSA-5j3f-64r7-f564 (PHP-CGI out-of-bounds read and write during
+ PATH_INFO correction). (CVE-2026-129538) (Jakub Zelenka)
+
+ - Date:
+ . Fixed GHSA-gr4f-wgx5-jpfv (Timezone cache use-after-free can lead to remote
+ code execution). (CVE-2026-129496) (Ilija Tovilo)
+
+ - FPM:
+ . Fixed GHSA-qc49-hpvq-g2w6 (PHP-FPM request smuggling through an unread HTTP
+ request body). (CVE-2026-129289) (Jakub Zelenka)
+ . Fixed GHSA-3mg3-cr28-46gc (PHP-FPM status endpoint XSS via unescaped user
+ and script fields). (CVE-2026-129292) (Jakub Zelenka)
+ . Fixed GHSA-jm4m-qfqx-967m (PHP-FPM epoll use-after-free can lead to local
+ privilege escalation). (CVE-2026-129291) (Ian P. Christian, Nora Dossche)
+
+ - Phar:
+ . Fixed GHSA-68fq-fh7h-f8gr (PHAR OpenSSL signature bypass via algorithm
+ downgrade). (CVE-2026-128090) (Alexandre Daubois)
+
+ - Session:
+ . Fixed GHSA-fm2m-fjf5-v3cp (Partially overwritten session files can lead to
+ remote code execution). (CVE-2026-126714) (Ilija Tovilo)
+ . Fixed GHSA-658j-r8rw-q6mx (Session serializer mismatch can lead to remote
+ code execution). (CVE-2026-115560) (Arnaud Le Blanc)
++ . Fixed GHSA-g3vh-838c-65v7 (Use-after-free after interrupted session
++ shutdown). (CVE-2026-129481) (Arnaud Le Blanc, Jakub Zelenka)
+
+ - SOAP:
+ . Fixed GHSA-q23r-hr55-xmpg (SOAP information disclosure through malformed
+ array dimensions). (CVE-2026-15353) (Alexandre Daubois)
+ . Fixed GHSA-4646-p932-gw34 (SOAP use-after-free when processing DTD entity
+ references). (CVE-2026-129506) (Jakub Zelenka)
+
+ - Standard:
+ . Fixed GHSA-f6gg-rchx-xw8j (Mixed-case HTTPS and FTPS URLs can expose data
+ in plaintext). (CVE-2026-128064) (Jakub Zelenka)
+ . Fixed GHSA-mmf9-xm3v-hg2x (Denial of service through folded HTTP response
+ headers). (CVE-2026-127960) (Jakub Zelenka)
-21 Oct 2026, PHP 8.2.35
+21 Oct 2026, PHP 8.3.36
- Core:
. Fixed GHSA-w8hw-w9fx-j79w, GHSA-6wmf-4rv5-p3rp (Avoid state corruption via
diff --cc ext/session/session.c
index 45d53366629,3a68f0f447d..ac429988347
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@@ -93,8 -94,13 +93,14 @@@ zend_class_entry *php_session_update_ti
return FAILURE; \
}
+ #define SESSION_CHECK_UPLOAD_PROGRESS_STATE \
+ if (PS(rfc1867_enabled) && stage == ZEND_INI_STAGE_RUNTIME) { \
+ zend_throw_error(NULL, "Session ini settings cannot be changed at runtime when session.upload_progress.enabled is On"); \
+ return FAILURE; \
+ }
+
#define SESSION_FORBIDDEN_CHARS "=,;.[ \t\r\n\013\014"
+#define SESSION_FORBIDDEN_CHARS_FOR_ERROR_MSG "=,;.[ \\t\\r\\n\\013\\014"
#define APPLY_TRANS_SID (PS(use_trans_sid) && !PS(use_only_cookies))
diff --cc ext/zend_test/test.c
index 0d493eeecf0,bea3fe223f7..bc9bbc5e083
--- a/ext/zend_test/test.c
+++ b/ext/zend_test/test.c
@@@ -742,39 -614,17 +742,50 @@@ static PHP_INI_MH(OnUpdateZendTestObser
return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
}
+static ZEND_FUNCTION(zend_test_fill_packed_array)
+{
+ HashTable *parameter;
+
+ ZEND_PARSE_PARAMETERS_START(1, 1)
+ Z_PARAM_ARRAY_HT_EX(parameter, 0, 1)
+ ZEND_PARSE_PARAMETERS_END();
+
+ if (!HT_IS_PACKED(parameter)) {
+ zend_argument_value_error(1, "must be a packed array");
+ RETURN_THROWS();
+ }
+
+ zend_hash_extend(parameter, parameter->nNumUsed + 10, true);
+ ZEND_HASH_FILL_PACKED(parameter) {
+ for (int i = 0; i < 10; i++) {
+ zval value;
+ ZVAL_LONG(&value, i);
+ ZEND_HASH_FILL_ADD(&value);
+ }
+ } ZEND_HASH_FILL_END();
+}
+
+static ZEND_FUNCTION(get_open_basedir)
+{
+ ZEND_PARSE_PARAMETERS_NONE();
+ if (PG(open_basedir)) {
+ RETURN_STRING(PG(open_basedir));
+ } else {
+ RETURN_NULL();
+ }
+}
+
+ static PHP_INI_MH(OnUpdateZendTestWarnOnStartup)
+ {
+ zend_result result = OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+ if (result == SUCCESS) {
+ if (*(bool *)ZEND_INI_GET_ADDR()) {
+ zend_error(E_WARNING, "Test startup warning from zend_test");
+ }
+ }
+ return result;
+ }
+
static ZEND_FUNCTION(zend_test_is_pcre_bundled)
{
ZEND_PARSE_PARAMETERS_NONE();
diff --cc sapi/fpm/fpm/fpm_status.c
index 9bd747218e8,3deb4450e02..8b5bd3868f9
--- a/sapi/fpm/fpm/fpm_status.c
+++ b/sapi/fpm/fpm/fpm_status.c
@@@ -45,10 -45,35 +45,36 @@@ int fpm_status_init_child(struct fpm_wo
}
/* }}} */
+ static char *fpm_status_escape(const char *str, bool encode_html, bool encode_json, zend_string **tmp)
+ {
+ char *escaped;
+
+ *tmp = NULL;
+ if (str[0] == '\0') {
+ return NULL;
+ }
+ if (encode_html) {
+ *tmp = php_escape_html_entities_ex((const unsigned char *) str, strlen(str), 1,
+ ENT_DISALLOWED | ENT_HTML_DOC_XML1 | ENT_COMPAT, NULL, /* double_encode */ 1, /* quiet */ 0);
+ return ZSTR_VAL(*tmp);
+ }
+ if (encode_json) {
+ *tmp = php_json_encode_string(str, strlen(str), PHP_JSON_INVALID_UTF8_IGNORE);
+ escaped = ZSTR_VAL(*tmp);
+ /* remove quotes around the string */
+ if (ZSTR_LEN(*tmp) >= 2) {
+ escaped[ZSTR_LEN(*tmp) - 1] = '\0';
+ ++escaped;
+ }
+ return escaped;
+ }
+ return (char *) str;
+ }
+
int fpm_status_export_to_zval(zval *status)
{
- struct fpm_scoreboard_s scoreboard, *scoreboard_p;
+ struct fpm_scoreboard_s *scoreboard_p;
+ struct fpm_scoreboard_proc_s *proc_p;
zval fpm_proc_stats, fpm_proc_stat;
time_t now_epoch;
struct timeval duration, now;
@@@ -604,8 -607,8 +591,8 @@@ int fpm_status_handle_request(void) /*
time_buffer,
(unsigned long) (now_epoch - proc->start_epoch),
proc->requests,
- duration.tv_sec * 1000000UL + duration.tv_usec,
+ (unsigned long) (duration.tv_sec * 1000000UL + duration.tv_usec),
- proc->request_method[0] != '\0' ? proc->request_method : "-",
+ request_method_string ? request_method_string : "-",
request_uri_string ? request_uri_string : "-",
query_string ? "?" : "",
query_string ? query_string : "",