Commit cb5c461cfdd for php

commit cb5c461cfdd3265367b79ec467ff5ad3683f5ae8
Merge: 541c0ad1b90 a38ab8c8ad3
Author: Jakub Zelenka <bukka@php.net>
Date:   Thu Nov 19 16:11:39 2026 +0100

    Merge branch 'PHP-8.5' into PHP-8.6

    * PHP-8.5: (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()
      ...

    # Conflicts:
    #       NEWS
    #       ext/session/session.c
    #       ext/standard/ftp_fopen_wrapper.c
    #       ext/standard/http_fopen_wrapper.c

diff --cc Zend/zend_API.c
index 55aa6ae8497,1d47de77911..0877d34c9ad
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@@ -3496,9 -3473,12 +3499,12 @@@ ZEND_API void zend_deactivate_modules(v
  		zend_module_entry **p = module_request_shutdown_handlers;

  		while (*p) {
 -			zend_module_entry *module = *p;
 +			const zend_module_entry *module = *p;
  			zend_try {
  				module->request_shutdown_func(module->type, module->module_number);
+ 			} zend_catch {
+ 				/* module shutdown is incomplete */
+ 				_exit(1);
  			} zend_end_try();
  			p++;
  		}
diff --cc ext/session/session.c
index ef5e35f6669,ed61613d871..dbd0310d278
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@@ -82,18 -83,24 +82,24 @@@ zend_class_entry *php_session_update_ti
  #define IF_SESSION_VARS() \
  	if (Z_ISREF_P(&PS(http_session_vars)) && Z_TYPE_P(Z_REFVAL(PS(http_session_vars))) == IS_ARRAY)

 -#define SESSION_CHECK_ACTIVE_STATE	\
 -	if (PS(session_status) == php_session_active) {	\
 -		php_session_session_already_started_error(E_WARNING, "Session ini settings cannot be changed when a session is active");	\
 -		return FAILURE;	\
 +#define SESSION_CHECK_ACTIVE_STATE \
 +	if (PS(session_status) == php_session_active) { \
 +		php_session_session_already_started_error(E_WARNING, "Session ini settings cannot be changed when a session is active"); \
 +		return FAILURE; \
  	}

 -#define SESSION_CHECK_OUTPUT_STATE										\
 -	if (SG(headers_sent) && stage != ZEND_INI_STAGE_DEACTIVATE) {												\
 -		php_session_headers_already_sent_error(E_WARNING, "Session ini settings cannot be changed after headers have already been sent");	\
 -		return FAILURE;													\
 +#define SESSION_CHECK_OUTPUT_STATE \
 +	if (SG(headers_sent) && stage != ZEND_INI_STAGE_DEACTIVATE) { \
 +		php_session_headers_already_sent_error(E_WARNING, "Session ini settings cannot be changed after headers have already been sent"); \
 +		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"

@@@ -598,9 -620,10 +606,10 @@@ static void php_session_normalize_vars(

  static PHP_INI_MH(OnUpdateSaveHandler)
  {
 -	const ps_module *tmp;
 +	const ps_module *new_module;
  	int err_type = E_ERROR;

+ 	SESSION_CHECK_UPLOAD_PROGRESS_STATE;
  	SESSION_CHECK_ACTIVE_STATE;
  	SESSION_CHECK_OUTPUT_STATE;

@@@ -633,8 -656,9 +642,9 @@@

  static PHP_INI_MH(OnUpdateSerializer)
  {
 -	const ps_serializer *tmp;
 +	const ps_serializer *new_serializer;

+ 	SESSION_CHECK_UPLOAD_PROGRESS_STATE;
  	SESSION_CHECK_ACTIVE_STATE;
  	SESSION_CHECK_OUTPUT_STATE;

@@@ -696,8 -717,10 +707,9 @@@ static PHP_INI_MH(OnUpdateSaveDir
  	return OnUpdateStr(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
  }

 -
  static PHP_INI_MH(OnUpdateName)
  {
+ 	SESSION_CHECK_UPLOAD_PROGRESS_STATE;
  	SESSION_CHECK_ACTIVE_STATE;
  	SESSION_CHECK_OUTPUT_STATE;

@@@ -726,8 -749,10 +738,9 @@@
  	return OnUpdateStrNotEmpty(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
  }

 -
  static PHP_INI_MH(OnUpdateCookieLifetime)
  {
+ 	SESSION_CHECK_UPLOAD_PROGRESS_STATE;
  	SESSION_CHECK_ACTIVE_STATE;
  	SESSION_CHECK_OUTPUT_STATE;

@@@ -755,48 -771,29 +768,52 @@@
  	return OnUpdateLongGEZero(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
  }

 -
  static PHP_INI_MH(OnUpdateSessionLong)
  {
+ 	SESSION_CHECK_UPLOAD_PROGRESS_STATE;
  	SESSION_CHECK_ACTIVE_STATE;
  	SESSION_CHECK_OUTPUT_STATE;
 +
  	return OnUpdateLong(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
  }

  static PHP_INI_MH(OnUpdateSessionStr)
  {
+ 	SESSION_CHECK_UPLOAD_PROGRESS_STATE;
  	SESSION_CHECK_ACTIVE_STATE;
  	SESSION_CHECK_OUTPUT_STATE;
 +
 +	if (new_value && zend_str_has_nul_byte(new_value)) {
 +		if (stage != ZEND_INI_STAGE_DEACTIVATE) {
 +			php_error_docref(NULL, E_WARNING, "\"%pS\" must not contain null bytes", entry->name);
 +		}
 +		return FAILURE;
 +	}
 +
  	return OnUpdateStr(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;
 +
 +	if (new_value && ZSTR_LEN(new_value) > 0 && !php_is_valid_samesite_value(new_value)) {
 +		php_error_docref(NULL, E_WARNING,
 +			"session.cookie_samesite must be \"Strict\", \"Lax\", \"None\", or \"\"");
 +		return FAILURE;
 +	}
 +
 +	return OnUpdateStr(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
 +}

  static PHP_INI_MH(OnUpdateSessionBool)
  {
+ 	SESSION_CHECK_UPLOAD_PROGRESS_STATE;
  	SESSION_CHECK_ACTIVE_STATE;
  	SESSION_CHECK_OUTPUT_STATE;
 +
  	return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
  }

@@@ -805,11 -803,10 +822,12 @@@ static PHP_INI_MH(OnUpdateSidLength
  	zend_long val;
  	char *endptr = NULL;

+ 	SESSION_CHECK_UPLOAD_PROGRESS_STATE;
  	SESSION_CHECK_ACTIVE_STATE;
  	SESSION_CHECK_OUTPUT_STATE;
 +
  	val = ZEND_STRTOL(ZSTR_VAL(new_value), &endptr, 10);
 +
  	if (val != 32) {
  		php_error_docref("session.configuration", E_DEPRECATED, "session.sid_length INI setting is deprecated");
  	}
@@@ -829,11 -826,10 +847,12 @@@ static PHP_INI_MH(OnUpdateSidBits
  	zend_long val;
  	char *endptr = NULL;

+ 	SESSION_CHECK_UPLOAD_PROGRESS_STATE;
  	SESSION_CHECK_ACTIVE_STATE;
  	SESSION_CHECK_OUTPUT_STATE;
 +
  	val = ZEND_STRTOL(ZSTR_VAL(new_value), &endptr, 10);
 +
  	if (val != 4) {
  		php_error_docref("session.configuration", E_DEPRECATED, "session.sid_bits_per_character INI setting is deprecated");
  	}
@@@ -850,38 -846,40 +869,40 @@@

  static PHP_INI_MH(OnUpdateSessionGcProbability)
  {
 -    SESSION_CHECK_UPLOAD_PROGRESS_STATE;
 -    SESSION_CHECK_ACTIVE_STATE;
 -    SESSION_CHECK_OUTPUT_STATE;
++	SESSION_CHECK_UPLOAD_PROGRESS_STATE;
 +	SESSION_CHECK_ACTIVE_STATE;
 +	SESSION_CHECK_OUTPUT_STATE;

 -    zend_long tmp = zend_ini_parse_quantity_warn(new_value, entry->name);
 +	zend_long new_probability = zend_ini_parse_quantity_warn(new_value, entry->name);

 -    if (tmp < 0) {
 -        php_error_docref("session.gc_probability", E_WARNING, "session.gc_probability must be greater than or equal to 0");
 -        return FAILURE;
 -    }
 +	if (new_probability < 0) {
 +		php_error_docref("session.gc_probability", E_WARNING, "session.gc_probability must be greater than or equal to 0");
 +		return FAILURE;
 +	}

 -    zend_long *p = (zend_long *) ZEND_INI_GET_ADDR();
 -    *p = tmp;
 +	zend_long *p = ZEND_INI_GET_ADDR();
 +	*p = new_probability;

 -    return SUCCESS;
 +	return SUCCESS;
  }

  static PHP_INI_MH(OnUpdateSessionDivisor)
  {
 -    SESSION_CHECK_UPLOAD_PROGRESS_STATE;
 -    SESSION_CHECK_ACTIVE_STATE;
 -    SESSION_CHECK_OUTPUT_STATE;
++	SESSION_CHECK_UPLOAD_PROGRESS_STATE;
 +	SESSION_CHECK_ACTIVE_STATE;
 +	SESSION_CHECK_OUTPUT_STATE;

 -    zend_long tmp = zend_ini_parse_quantity_warn(new_value, entry->name);
 +	zend_long new_divisor = zend_ini_parse_quantity_warn(new_value, entry->name);

 -    if (tmp <= 0) {
 -        php_error_docref("session.gc_divisor", E_WARNING, "session.gc_divisor must be greater than 0");
 -        return FAILURE;
 -    }
 +	if (new_divisor <= 0) {
 +		php_error_docref("session.gc_divisor", E_WARNING, "session.gc_divisor must be greater than 0");
 +		return FAILURE;
 +	}

 -    zend_long *p = (zend_long *) ZEND_INI_GET_ADDR();
 -    *p = tmp;
 +	zend_long *p = ZEND_INI_GET_ADDR();
 +	*p = new_divisor;

 -    return SUCCESS;
 +	return SUCCESS;
  }

  static PHP_INI_MH(OnUpdateRfc1867Freq)
@@@ -908,12 -903,11 +929,13 @@@

  static PHP_INI_MH(OnUpdateUseOnlyCookies)
  {
+ 	SESSION_CHECK_UPLOAD_PROGRESS_STATE;
  	SESSION_CHECK_ACTIVE_STATE;
  	SESSION_CHECK_OUTPUT_STATE;
 -	bool *p = (bool *) ZEND_INI_GET_ADDR();
 +
 +	bool *p = ZEND_INI_GET_ADDR();
  	*p = zend_ini_parse_bool(new_value);
 +
  	if (!*p) {
  		php_error_docref("session.configuration", E_DEPRECATED, "Disabling session.use_only_cookies INI setting is deprecated");
  	}
@@@ -923,12 -916,11 +945,13 @@@

  static PHP_INI_MH(OnUpdateUseTransSid)
  {
+ 	SESSION_CHECK_UPLOAD_PROGRESS_STATE;
  	SESSION_CHECK_ACTIVE_STATE;
  	SESSION_CHECK_OUTPUT_STATE;
 -	bool *p = (bool *) ZEND_INI_GET_ADDR();
 +
 +	bool *p = ZEND_INI_GET_ADDR();
  	*p = zend_ini_parse_bool(new_value);
 +
  	if (*p) {
  		php_error_docref("session.configuration", E_DEPRECATED, "Enabling session.use_trans_sid INI setting is deprecated");
  	}
@@@ -938,16 -929,9 +961,17 @@@

  static PHP_INI_MH(OnUpdateRefererCheck)
  {
+ 	SESSION_CHECK_UPLOAD_PROGRESS_STATE;
  	SESSION_CHECK_ACTIVE_STATE;
  	SESSION_CHECK_OUTPUT_STATE;
 +
 +	if (zend_str_has_nul_byte(new_value)) {
 +		if (stage != ZEND_INI_STAGE_DEACTIVATE) {
 +			php_error_docref(NULL, E_WARNING, "\"%pS\" must not contain null bytes", entry->name);
 +		}
 +		return FAILURE;
 +	}
 +
  	if (ZSTR_LEN(new_value) != 0) {
  		php_error_docref("session.configuration", E_DEPRECATED, "Usage of session.referer_check INI setting is deprecated");
  	}
@@@ -2952,13 -3006,14 +2976,14 @@@ static PHP_GINIT_FUNCTION(ps
  	ps_globals->serializer = NULL;
  	ps_globals->mod_data = NULL;
  	ps_globals->in_rfc1867_update = false;
+ 	ps_globals->rfc1867_enabled = false;
  	ps_globals->session_status = php_session_none;
  	ps_globals->default_mod = NULL;
 -	ps_globals->mod_user_implemented = 0;
 -	ps_globals->mod_user_class_name = NULL;
 -	ps_globals->mod_user_is_open = 0;
 +	ps_globals->mod_user_implemented = false;
 +	ps_globals->mod_user_is_open = false;
 +	ps_globals->mod_user_uses_object_methods_as_handlers = false;
  	ps_globals->session_vars = NULL;
 -	ps_globals->set_handler = 0;
 +	ps_globals->set_handler = false;
  	ps_globals->session_started_filename = NULL;
  	ps_globals->session_started_lineno = 0;
  	/* Unset user defined handlers */
diff --cc ext/standard/ftp_fopen_wrapper.c
index c1341ff6266,64f748f1a98..27f665fc349
--- a/ext/standard/ftp_fopen_wrapper.c
+++ b/ext/standard/ftp_fopen_wrapper.c
@@@ -170,15 -177,7 +170,15 @@@ static php_stream *php_ftp_fopen_connec
  		return NULL;
  	}

 +	/* Searching for a substring is a bit expensive, and this is just a
 +	 * hardening assertion to confirm php_uri_parse_to_struct() stripped any
 +	 * CRLF sequence, only run in debug mode. */
 +#if ZEND_DEBUG
 +	char *pos = strstr(ZSTR_VAL(resource->path), "\r\n");
 +	ZEND_ASSERT(pos == NULL);
 +#endif
 +
- 	use_ssl = resource->scheme && (ZSTR_LEN(resource->scheme) > 3) && ZSTR_VAL(resource->scheme)[3] == 's';
+ 	use_ssl = resource->scheme && zend_string_equals_literal_ci(resource->scheme, "ftps");

  	/* use port 21 if one wasn't specified */
  	if (resource->port == 0)
diff --cc ext/standard/http_fopen_wrapper.c
index 21a2be87571,ecea1699da8..35d5fe01322
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@@ -293,18 -298,23 +288,20 @@@ static bool php_stream_http_response_he
  		}
  	}

 -	zend_string *last_header_line_str = smart_str_extract(last_header);
 -	char *last_header_line = ZSTR_VAL(last_header_line_str);
 -	size_t last_header_line_length = ZSTR_LEN(last_header_line_str);
 -	char *last_header_line_end = ZSTR_VAL(last_header_line_str) + ZSTR_LEN(last_header_line_str) - 1;
++	zend_string *last_header_line = smart_str_extract(last_header);
+
  	/* Find header separator position. */
 -	char *last_header_value = memchr(last_header_line, ':', last_header_line_length);
 +	char *last_header_value = memchr(ZSTR_VAL(last_header_line), ':', ZSTR_LEN(last_header_line));
  	if (last_header_value) {
  		/* Verify there is no space in header name */
 -		char *last_header_name = last_header_line + 1;
 +		const char *last_header_name = ZSTR_VAL(last_header_line) + 1;
  		while (last_header_name < last_header_value) {
  			if (*last_header_name == ' ' || *last_header_name == '\t') {
  				header_info->error = true;
 -				php_stream_wrapper_log_error(wrapper, options,
 +				php_stream_wrapper_log_warn(wrapper, context, options, InvalidResponse,
  					"HTTP invalid response format (space in header name)!");
 -				zend_string_efree(last_header_line_str);
 +				zend_string_efree(last_header_line);
- 				return NULL;
+ 				return false;
  			}
  			++last_header_name;
  		}
@@@ -320,10 -329,10 +317,10 @@@
  	} else {
  		/* There is no colon which means invalid response so error. */
  		header_info->error = true;
 -		php_stream_wrapper_log_error(wrapper, options,
 +		php_stream_wrapper_log_warn(wrapper, context, options, InvalidResponse,
  				"HTTP invalid response format (no colon in header line)!");
 -		zend_string_efree(last_header_line_str);
 +		zend_string_efree(last_header_line);
- 		return NULL;
+ 		return false;
  	}

  	bool store_header = true;
@@@ -344,11 -353,11 +341,11 @@@
  		size_t last_header_value_len = strlen(last_header_value);
  		if (last_header_value_len > HTTP_HEADER_MAX_LOCATION_SIZE) {
  			header_info->error = true;
 -			php_stream_wrapper_log_error(wrapper, options,
 +			php_stream_wrapper_log_warn(wrapper, context, options, InvalidResponse,
  					"HTTP Location header size is over the limit of %d bytes",
  					HTTP_HEADER_MAX_LOCATION_SIZE);
 -			zend_string_efree(last_header_line_str);
 +			zend_string_efree(last_header_line);
- 			return NULL;
+ 			return false;
  		}
  		if (header_info->location == NULL) {
  			header_info->location = emalloc(last_header_value_len + 1);
@@@ -401,32 -410,15 +398,32 @@@

  	if (store_header) {
  		zval http_header;
 -		ZVAL_NEW_STR(&http_header, last_header_line_str);
 +		ZVAL_NEW_STR(&http_header, last_header_line);
  		zend_hash_next_index_insert(Z_ARRVAL_P(response_header), &http_header);
  	} else {
 -		zend_string_efree(last_header_line_str);
 +		zend_string_efree(last_header_line);
  	}

- 	return NULL;
+ 	return false;
  }

 +static inline void smart_str_append_header_value(smart_str *dest, const zend_string *value, const char *header_name)
 +{
 +	const char *src = ZSTR_VAL(value);
 +	size_t len = ZSTR_LEN(value);
 +	size_t i = 0;
 +	while (i < len && src[i] != '\r' && src[i] != '\n') {
 +		i++;
 +	}
 +	if (i < len) {
 +		smart_str_appendl(dest, src, i);
 +		php_error_docref(NULL, E_WARNING,
 +			"Header %s value contains newline characters and has been truncated", header_name);
 +	} else {
 +		smart_str_append(dest, value);
 +	}
 +}
 +
  static php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper,
  		const char *path, const char *mode, int options, zend_string **opened_path,
  		php_stream_context *context, int redirect_max, int flags,
diff --cc ext/uri/uri_parser_rfc3986.c
index 94e6e0caffd,faf3d3acdbd..f9e91306390
--- a/ext/uri/uri_parser_rfc3986.c
+++ b/ext/uri/uri_parser_rfc3986.c
@@@ -739,8 -662,10 +739,10 @@@ ZEND_ATTRIBUTE_NONNULL static void *php
  	return new_uriparser_uris;
  }

 -ZEND_ATTRIBUTE_NONNULL static zend_string *php_uri_parser_rfc3986_to_string(void *uri, php_uri_recomposition_mode recomposition_mode, bool exclude_fragment)
 +ZEND_ATTRIBUTE_NONNULL static zend_string *php_uri_parser_rfc3986_to_string(void *uri, const php_uri_recomposition_mode recomposition_mode, const bool exclude_fragment)
  {
+ 	zend_string *uri_string = NULL;
+
  	php_uri_parser_rfc3986_uris *uriparser_uris = uri;
  	const UriUriA *uriparser_uri;