Commit c96900ee74a for php.net
commit c96900ee74a4ea90c85597a35c6ef6d83bb46d78
Merge: daf21f46308 0990de7a559
Author: Ilia Alshanetsky <ilia@ilia.ws>
Date: Sun Aug 23 13:03:35 2026 -0400
Merge branch 'PHP-8.5'
* PHP-8.5:
ext/session: report a rejected session cookie header
diff --cc ext/session/session.c
index 6a9f2b355c1,26df9c68f9b..21545ecc01b
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@@ -1480,12 -1447,12 +1480,12 @@@ static zend_result php_session_send_coo
smart_str_0(&ncookie);
php_session_remove_cookie(); /* remove already sent session ID cookie */
- /* 'replace' must be 0 here, else a previous Set-Cookie
- header, probably sent with setcookie() will be replaced! */
- zend_result result = sapi_add_header_ex(estrndup(ZSTR_VAL(ncookie.s), ZSTR_LEN(ncookie.s)), ZSTR_LEN(ncookie.s), 0, 0);
+ /* 'replace' must be 0 here, else a previous Set-Cookie
+ header, probably sent with setcookie() will be replaced! */
- sapi_add_header_ex(estrndup(ZSTR_VAL(ncookie.s), ZSTR_LEN(ncookie.s)), ZSTR_LEN(ncookie.s), false, false);
++ zend_result result = sapi_add_header_ex(estrndup(ZSTR_VAL(ncookie.s), ZSTR_LEN(ncookie.s)), ZSTR_LEN(ncookie.s), false, false);
smart_str_free(&ncookie);
- return SUCCESS;
+ return result;
}
PHPAPI const ps_module *_php_find_ps_module(const char *name)