Merge branch 'master' into gh19637-closure-scope

Author: TimWolla

.github/labeler.yml

@@ -492,6 +492,7 @@
       - 'ext/spl/spl_iterators.h'
       - 'ext/spl/spl_observer.h'
       - 'ext/standard/*.h'
+      - 'ext/uri/*.h'
       - 'ext/xml/expat_compat.h'
       - 'ext/xml/php_xml.h'
       - 'main/*.h'

NEWS

@@ -23,6 +23,10 @@ PHP                                                                        NEWS
   . Fixed memory management of Uri\WhatWg\Url objects. (timwolla)
   . Fixed memory management of the internal "parse_url" URI parser.
     (timwolla)
+  . Fixed double-free when assigning to $errors fails when using
+    the Uri\WhatWg\Url parser. (timwolla)
+  . Reject out-of-range ports when using the Uri\Rfc3986\Uri parser.
+    (timwolla)
   . Clean up naming of internal API. (timwolla)
 
 28 Aug 2025, PHP 8.5.0beta2

UPGRADING.INTERNALS

@@ -14,7 +14,6 @@ PHP 8.5 INTERNALS UPGRADE NOTES
 1. Internal API changes
 ========================
 
-- Core
   . PG(arg_separator).input and PG(arg_separator).output are now `zend_string*`
     instead of `char*`.
   . DL_LOAD now doesn't use RTLD_DEEPBIND deepbind anymore on platforms
@@ -34,16 +33,6 @@ PHP 8.5 INTERNALS UPGRADE NOTES
     pointer. If the error will be delayed until runtime, it is stored in the
     new `validation_error` field of the `zend_attribute` struct.
     RFC: https://wiki.php.net/rfc/delayedtargetvalidation_attribute
-
-- Hash
-  . Hash functions now use proper hash_spec_result enum for return values
-    instead of using SUCCESS and FAILURE.
-
-- Random
-  . The handlers parameter of php_random_engine_common_init() has been
-    removed. Use the default_object_handlers field on the CE instead.
-
-- Zend
   . Added zend_safe_assign_to_variable_noref() function to safely assign
     a value to a non-reference zval.
   . Added zval_ptr_safe_dtor() to safely destroy a zval when a destructor
@@ -91,13 +80,6 @@ PHP 8.5 INTERNALS UPGRADE NOTES
     from the parent process after a fork().
   . HASH_KEY_IS_* constants have been moved in the zend_hash_key_type enum.
 
-- standard
-  . ext/standard/php_smart_string.h and ext/standard/php_smart_string_public.h
-    were removed. Use the corresponding headers in Zend/ instead.
-
-- URI
-  . Internal API for URI handling was added via the php_uri_*() functions.
-
 ========================
 2. Build system changes
 ========================
@@ -136,26 +118,34 @@ PHP 8.5 INTERNALS UPGRADE NOTES
 3. Module changes
 ========================
 
-- ext/gd
+- Gd:
   . The gdImageScale*() and gdImageRotate*() helpers are now internal in the
     bundled libgd, like they have been in external libgd as of gd-2.1.1.
 
-- ext/json
+- Hash:
+  . Hash functions now use proper hash_spec_result enum for return values
+    instead of using SUCCESS and FAILURE.
+
+- JSON:
   . php_json_encode_serializable_object() now assumes `EG(active)`,
     if not a bailout is caused. Therefore a minor BC break exists if the
     `PHP_JSON_PARTIAL_OUTPUT_ON_ERROR` option is in use.
     However, this situation is highly unlikely.
 
-- ext/libxml
+- Libxml:
   . The refcount APIs now return an `unsigned int` instead of an `int`.
   . Removed php_libxml_xmlCheckUTF8(). Use xmlCheckUTF8() from libxml instead.
 
-- ext/pdo
+- PDO:
   . Added `php_pdo_stmt_valid_db_obj_handle()` to check if the database object
     is still valid. This is useful when a GC cycle is collected and the
     database object can be destroyed prior to destroying the statement.
 
-- ext/standard
+- Random:
+  . The handlers parameter of php_random_engine_common_init() has been
+    removed. Use the default_object_handlers field on the CE instead.
+
+- Standard:
   . Added php_url_decode_ex() and php_raw_url_decode_ex() that unlike their
     non-ex counterparts do not work in-place.
   . The php_std_date() function has been removed. Use php_format_date() with
@@ -165,6 +155,11 @@ PHP 8.5 INTERNALS UPGRADE NOTES
     and image_type_to_extension() is now extensible using the internal APIs
     php_image_register_handler() and php_image_unregister_handler() in
     php_image.h.
+  . ext/standard/php_smart_string.h and ext/standard/php_smart_string_public.h
+    were removed. Use the corresponding headers in Zend/ instead.
+
+- URI:
+  . Internal API for URI handling was added via the php_uri_*() functions.
 
 ========================
 4. OpCode changes

Zend/Optimizer/zend_func_infos.h

@@ -510,7 +510,7 @@ static const func_info_t func_infos[] = {
 	F1("getcwd", MAY_BE_STRING|MAY_BE_FALSE),
 	F1("readdir", MAY_BE_STRING|MAY_BE_FALSE),
 	F1("scandir", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_FALSE),
-	F1("glob", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_FALSE),
+	FN("glob", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_FALSE),
 	F1("exec", MAY_BE_STRING|MAY_BE_FALSE),
 	F1("system", MAY_BE_STRING|MAY_BE_FALSE),
 	F1("escapeshellcmd", MAY_BE_STRING),

configure.ac

@@ -128,6 +128,17 @@ AS_VAR_IF([cross_compiling], [yes],
     AC_MSG_RESULT([$BUILD_CC])],
   [BUILD_CC=$CC])
 
+dnl The macro AC_PROG_CC_C99 sets the shell variable ac_cv_prog_cc_c99 to 'no'
+dnl if the compiler does not support C99.i.e. does not support any of _Bool,
+dnl flexible arrays, inline, long long int, mixed code and declarations,
+dnl named initialization of structs, restrict, varargs macros, variable
+dnl declarations in for loops and variable length arrays.
+dnl
+dnl https://www.gnu.org/software/autoconf/manual/autoconf-2.60/html_node/C-Compiler.html
+if test "$ac_cv_prog_cc_c99" = no; then
+  AC_MSG_ERROR([C compiler would not accept C99 code])
+fi
+
 dnl Support systems with system libraries in e.g. /usr/lib64.
 PHP_ARG_WITH([libdir],
   [for system library directory],

ext/filter/logical_filters.c

@@ -612,7 +612,7 @@ zend_result php_filter_validate_url(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 	int parser_name_set;
 	FETCH_STR_OPTION(parser_name, URL_OPTION_URI_PARSER_CLASS);
 
-	uri_parser_t *uri_parser = php_uri_get_parser(parser_name_set ? parser_name : NULL);
+	const uri_parser_t *uri_parser = php_uri_get_parser(parser_name_set ? parser_name : NULL);
 	if (uri_parser == NULL) {
 		zend_value_error("%s(): \"uri_parser_class\" option has invalid value", get_active_function_name());
 		RETURN_VALIDATION_FAILED

ext/opcache/tests/opcache_enable_noop_001.phpt

@@ -0,0 +1,24 @@
+--TEST--
+Dynamically setting opcache.enable does not warn when noop
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+--EXTENSIONS--
+opcache
+--FILE--
+<?php
+
+echo "Should not warn:", PHP_EOL;
+ini_set('opcache.enable', 1);
+echo "Disabling:", PHP_EOL;
+ini_set('opcache.enable', 0);
+echo "Should warn:", PHP_EOL;
+ini_set('opcache.enable', 1);
+
+?>
+--EXPECTF--
+Should not warn:
+Disabling:
+Should warn:
+
+Warning: Zend OPcache can't be temporarily enabled (it may be only disabled until the end of request) in %s on line %d

ext/opcache/tests/opcache_enable_noop_002.phpt

@@ -0,0 +1,18 @@
+--TEST--
+Dynamically setting opcache.enable warns when not a noop
+--INI--
+opcache.enable=0
+opcache.enable_cli=1
+--EXTENSIONS--
+opcache
+--FILE--
+<?php
+
+echo "Should warn, since the INI was initialized to 0:", PHP_EOL;
+ini_set('opcache.enable', 1);
+
+?>
+--EXPECTF--
+Should warn, since the INI was initialized to 0:
+
+Warning: Zend OPcache can't be temporarily enabled (it may be only disabled until the end of request) in %s on line %d

ext/opcache/zend_accelerator_module.c

@@ -159,10 +159,23 @@ static ZEND_INI_MH(OnEnable)
 	    stage == ZEND_INI_STAGE_DEACTIVATE) {
 		return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
 	} else {
-		/* It may be only temporary disabled */
+		/* It may be only temporarily disabled */
 		bool *p = (bool *) ZEND_INI_GET_ADDR();
 		if (zend_ini_parse_bool(new_value)) {
-			zend_error(E_WARNING, ACCELERATOR_PRODUCT_NAME " can't be temporary enabled (it may be only disabled till the end of request)");
+			if (*p) {
+				/* Do not warn if OPcache is enabled, as the update would be a noop anyways. */
+				return SUCCESS;
+			}
+
+			if (stage == ZEND_INI_STAGE_ACTIVATE) {
+				if (strcmp(sapi_module.name, "fpm-fcgi") == 0) {
+					zend_accel_error(ACCEL_LOG_WARNING, ACCELERATOR_PRODUCT_NAME " can't be temporarily enabled. Are you using php_admin_value[opcache.enable]=1 in an individual pool's configuration?");
+				} else {
+					zend_accel_error(ACCEL_LOG_WARNING, ACCELERATOR_PRODUCT_NAME " can't be temporarily enabled (it may be only disabled until the end of request)");
+				}
+			} else {
+				zend_error(E_WARNING, ACCELERATOR_PRODUCT_NAME " can't be temporarily enabled (it may be only disabled until the end of request)");
+			}
 			return FAILURE;
 		} else {
 			*p = 0;

ext/openssl/xp_ssl.c

@@ -2634,7 +2634,7 @@ static char *php_openssl_get_url_name(const char *resourcename,
 		return NULL;
 	}
 
-	uri_parser_t *uri_parser = php_stream_context_get_uri_parser("ssl", context);
+	const uri_parser_t *uri_parser = php_stream_context_get_uri_parser("ssl", context);
 	if (uri_parser == NULL) {
 		zend_value_error("%s(): Provided stream context has invalid value for the \"uri_parser_class\" option", get_active_function_name());
 		return NULL;