Commit 0990de7a559 for php.net

commit 0990de7a5593b842e9912942bc2be362314a42ad
Merge: ae52a3ed16c 0870487b625
Author: Ilia Alshanetsky <ilia@ilia.ws>
Date:   Sun Aug 23 13:00:28 2026 -0400

    Merge branch 'PHP-8.4' into PHP-8.5

    * PHP-8.4:
      ext/session: report a rejected session cookie header

diff --cc ext/session/session.c
index 845845d99ae,2073ea55fe1..26df9c68f9b
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@@ -1449,21 -1499,22 +1449,21 @@@ static zend_result php_session_send_coo
  	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! */
- 	sapi_add_header_ex(estrndup(ZSTR_VAL(ncookie.s), ZSTR_LEN(ncookie.s)), ZSTR_LEN(ncookie.s), 0, 0);
+ 	zend_result result = sapi_add_header_ex(estrndup(ZSTR_VAL(ncookie.s), ZSTR_LEN(ncookie.s)), ZSTR_LEN(ncookie.s), 0, 0);
  	smart_str_free(&ncookie);

- 	return SUCCESS;
+ 	return result;
  }
 -/* }}} */

 -PHPAPI const ps_module *_php_find_ps_module(const char *name) /* {{{ */
 +PHPAPI const ps_module *_php_find_ps_module(const char *name)
  {
 -	const ps_module *ret = NULL;
 -	const ps_module **mod;
 -	int i;
 +	const ps_module *found_module = NULL;
 +	const ps_module **current_module;
 +	int module_index;

 -	for (i = 0, mod = ps_modules; i < MAX_MODULES; i++, mod++) {
 -		if (*mod && !strcasecmp(name, (*mod)->s_name)) {
 -			ret = *mod;
 +	for (module_index = 0, current_module = ps_modules; module_index < MAX_MODULES; module_index++, current_module++) {
 +		if (*current_module && !strcasecmp(name, (*current_module)->s_name)) {
 +			found_module = *current_module;
  			break;
  		}
  	}