Commit 65d14188597 for php
commit 65d14188597f993963f57ba884a862831166b1f1
Merge: b889829bec3 cb5c461cfdd
Author: Jakub Zelenka <bukka@php.net>
Date: Thu Nov 19 16:12:05 2026 +0100
Merge branch 'PHP-8.6'
* PHP-8.6: (22 commits)
Fix GHSA-2fjv-p558-g82m: do not set last_fatal_error_backtrace during shutdown
Fix GHSA-mg3p-mxj9-g2mm: handle uriparser failures in php_uri_parser_rfc3986_to_string()
Fix GHSA-8mjj-2r7p-4hg2: UAF in debug_backtrace_get_args() on trampoline calls
Fix GHSA-x8r7-mg3g-74hg: Lifetime issue in Dom\XMLDocument serialiser
Revert "ext/session: Truncate session file after successful write"
Skip header_over_4gib.phpt when available memory is insufficient
PHP-8.3 is now for PHP 8.3.38-dev
Fix GHSA-g3vh-838c-65v7: Zero PS(session_started_filename) early
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()
...
diff --cc ext/session/session.c
index 9c1ac690513,dbd0310d278..191e350f485
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@@ -772,38 -793,9 +787,39 @@@ static PHP_INI_MH(OnUpdateSessionStr
return OnUpdateStr(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
}
+static bool php_session_cookie_attr_is_valid(const zend_ini_entry *entry, const zend_string *new_value, int stage, const char *forbidden, const char *forbidden_msg)
+{
+ if (new_value && strpbrk(ZSTR_VAL(new_value), forbidden) != NULL) {
+ if (stage != ZEND_INI_STAGE_DEACTIVATE) {
+ php_error_docref(NULL, E_WARNING, "\"%s\" must not contain any of the following characters \"%s\"", ZSTR_VAL(entry->name), forbidden_msg);
+ }
+ return false;
+ }
+
+ return true;
+}
+
+static PHP_INI_MH(OnUpdateSessionCookiePath)
+{
+ if (!php_session_cookie_attr_is_valid(entry, new_value, stage, SESSION_FORBIDDEN_COOKIE_PATH_CHARS, SESSION_FORBIDDEN_COOKIE_PATH_CHARS_FOR_ERROR_MSG)) {
+ return FAILURE;
+ }
+
+ return OnUpdateSessionStr(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+}
+
+static PHP_INI_MH(OnUpdateSessionCookieDomain)
+{
+ if (!php_session_cookie_attr_is_valid(entry, new_value, stage, SESSION_FORBIDDEN_COOKIE_DOMAIN_CHARS, SESSION_FORBIDDEN_COOKIE_DOMAIN_CHARS_FOR_ERROR_MSG)) {
+ return FAILURE;
+ }
+
+ return OnUpdateSessionStr(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
+}
+
static PHP_INI_MH(OnUpdateSessionSameSite)
{
+ SESSION_CHECK_UPLOAD_PROGRESS_STATE;
SESSION_CHECK_ACTIVE_STATE;
SESSION_CHECK_OUTPUT_STATE;