Merge tag 'php-8.2.17' into was-8.2.x

Tag for php-8.2.17

Author: MaxKellermann

.github/actions/setup-caddy/action.yml

@@ -3,8 +3,10 @@ runs:
   using: composite
   steps:
     - shell: bash
+      env:
+        GH_TOKEN: ${{ github.token }}
       run: |
         set -x
-        sudo curl 'https://caddyserver.com/api/download?os=linux&arch=amd64' -o /usr/bin/caddy
+        gh release -R caddyserver/caddy download --pattern 'caddy_*_linux_amd64.tar.gz' -O - | sudo tar -xz -C /usr/bin caddy
         sudo chmod +x /usr/bin/caddy
         sudo caddy start --config ext/curl/tests/Caddyfile

.github/actions/test-linux/action.yml

@@ -46,7 +46,7 @@ runs:
           --show-diff \
           --show-slow 1000 \
           --set-timeout 120
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: always() && inputs.testArtifacts != null
       with:
         name: ${{ github.job }}_${{ inputs.testArtifacts }}

.github/actions/test-macos/action.yml

@@ -28,7 +28,7 @@ runs:
           --show-diff \
           --show-slow 1000 \
           --set-timeout 120
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: always() && inputs.testArtifacts != null
       with:
         name: ${{ github.job }}_${{ inputs.testArtifacts }}

.github/workflows/push.yml

@@ -2,7 +2,7 @@ name: Push
 on:
   push:
     paths-ignore:
-      - docs/*
+      - docs/**
       - NEWS
       - UPGRADING
       - UPGRADING.INTERNALS
@@ -11,8 +11,8 @@ on:
       - CODING_STANDARDS.md
       - .cirrus.yml
       - .travis.yml
-      - travis/*
-      - .circleci/*
+      - travis/**
+      - .circleci/**
     branches:
       - PHP-7.4
       - PHP-8.0
@@ -21,7 +21,7 @@ on:
       - master
   pull_request:
     paths-ignore:
-      - docs/*
+      - docs/**
       - NEWS
       - UPGRADING
       - UPGRADING.INTERNALS
@@ -30,8 +30,8 @@ on:
       - CODING_STANDARDS.md
       - .cirrus.yml
       - .travis.yml
-      - travis/*
-      - .circleci/*
+      - travis/**
+      - .circleci/**
     branches:
       - '**'
 concurrency:

NEWS

@@ -1,5 +1,41 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+14 Mar 2024, PHP 8.2.17
+
+- Core:
+  . Fix ZTS persistent resource crashes on shutdown. (nielsdos)
+
+- Curl:
+  . Fix failing tests due to string changes in libcurl 8.6.0. (Ayesh)
+
+- DOM:
+  . Fix reference access in dimensions for DOMNodeList and DOMNodeMap.
+    (nielsdos)
+
+- Fileinfo:
+  . Fixed bug GH-13344 (finfo::buffer(): Failed identify data 0:(null),
+    backport). (nielsdos)
+
+- FPM:
+  . Fixed bug #75712 (getenv in php-fpm should not read $_ENV, $_SERVER).
+    (Jakub Zelenka)
+
+- GD:
+  . Fixed bug GH-12019 (detection of image formats in system gd library).
+    (Michael Orlitzky)
+
+- MySQLnd:
+  . Fixed bug GH-11950 ([mysqlnd] Fixed not to set CR_MALFORMED_PACKET to error
+    if CR_SERVER_GONE_ERROR is already set). (Saki Takamachi)
+
+- PGSQL:
+  . Fixed bug GH-13354 (pg_execute/pg_send_query_params/pg_send_execute
+    with null value passed by reference). (George Barbarosie)
+
+- Standard:
+  . Fixed array key as hash to string (case insensitive) comparison typo
+    for the second operand buffer size (albeit unused for now). (A. Slepykh)
+
 15 Feb 2024, PHP 8.2.16
 
 - Core:

Zend/zend.c

@@ -1130,6 +1130,8 @@ void zend_shutdown(void) /* {{{ */
 #endif
 	zend_destroy_rsrc_list_dtors();
 
+	zend_unload_modules();
+
 	zend_optimizer_shutdown();
 	startup_done = false;
 }

Zend/zend.h

@@ -20,7 +20,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "4.2.16"
+#define ZEND_VERSION "4.2.17"
 
 #define ZEND_ENGINE_3
 
@@ -129,6 +129,7 @@ void zend_shutdown(void);
 void zend_register_standard_ini_entries(void);
 zend_result zend_post_startup(void);
 void zend_set_utility_values(zend_utility_values *utility_values);
+void zend_unload_modules(void);
 
 ZEND_API ZEND_COLD ZEND_NORETURN void _zend_bailout(const char *filename, uint32_t lineno);
 ZEND_API size_t zend_get_page_size(void);

Zend/zend_API.c

@@ -40,6 +40,7 @@ ZEND_API HashTable module_registry;
 static zend_module_entry **module_request_startup_handlers;
 static zend_module_entry **module_request_shutdown_handlers;
 static zend_module_entry **module_post_deactivate_handlers;
+static zend_module_entry **modules_dl_loaded;
 
 static zend_class_entry  **class_cleanup_handlers;
 
@@ -2291,6 +2292,7 @@ ZEND_API void zend_collect_module_handlers(void) /* {{{ */
 	int startup_count = 0;
 	int shutdown_count = 0;
 	int post_deactivate_count = 0;
+	int dl_loaded_count = 0;
 	zend_class_entry *ce;
 	int class_count = 0;
 
@@ -2305,6 +2307,9 @@ ZEND_API void zend_collect_module_handlers(void) /* {{{ */
 		if (module->post_deactivate_func) {
 			post_deactivate_count++;
 		}
+		if (module->handle) {
+			dl_loaded_count++;
+		}
 	} ZEND_HASH_FOREACH_END();
 	module_request_startup_handlers = (zend_module_entry**)realloc(
 		module_request_startup_handlers,
@@ -2317,6 +2322,9 @@ ZEND_API void zend_collect_module_handlers(void) /* {{{ */
 	module_request_shutdown_handlers[shutdown_count] = NULL;
 	module_post_deactivate_handlers = module_request_shutdown_handlers + shutdown_count + 1;
 	module_post_deactivate_handlers[post_deactivate_count] = NULL;
+	/* Cannot reuse module_request_startup_handlers because it is freed in zend_destroy_modules, which happens before zend_unload_modules. */
+	modules_dl_loaded = realloc(modules_dl_loaded, sizeof(zend_module_entry*) * (dl_loaded_count + 1));
+	modules_dl_loaded[dl_loaded_count] = NULL;
 	startup_count = 0;
 
 	ZEND_HASH_MAP_FOREACH_PTR(&module_registry, module) {
@@ -2329,6 +2337,9 @@ ZEND_API void zend_collect_module_handlers(void) /* {{{ */
 		if (module->post_deactivate_func) {
 			module_post_deactivate_handlers[--post_deactivate_count] = module;
 		}
+		if (module->handle) {
+			modules_dl_loaded[--dl_loaded_count] = module;
+		}
 	} ZEND_HASH_FOREACH_END();
 
 	/* Collect internal classes with static members */
@@ -3072,18 +3083,23 @@ void module_destructor(zend_module_entry *module) /* {{{ */
 		clean_module_functions(module);
 	}
 
-#if HAVE_LIBDL
-	if (module->handle && !getenv("ZEND_DONT_UNLOAD_MODULES")) {
-		DL_UNLOAD(module->handle);
-	}
-#endif
-
 #if ZEND_RC_DEBUG
 	zend_rc_debug = orig_rc_debug;
 #endif
 }
 /* }}} */
 
+void module_registry_unload(const zend_module_entry *module)
+{
+#if HAVE_LIBDL
+	if (!getenv("ZEND_DONT_UNLOAD_MODULES")) {
+		DL_UNLOAD(module->handle);
+	}
+#else
+	ZEND_IGNORE_VALUE(module);
+#endif
+}
+
 ZEND_API void zend_activate_modules(void) /* {{{ */
 {
 	zend_module_entry **p = module_request_startup_handlers;
@@ -3128,6 +3144,18 @@ ZEND_API void zend_deactivate_modules(void) /* {{{ */
 }
 /* }}} */
 
+void zend_unload_modules(void) /* {{{ */
+{
+	zend_module_entry **modules = modules_dl_loaded;
+	while (*modules) {
+		module_registry_unload(*modules);
+		modules++;
+	}
+	free(modules_dl_loaded);
+	modules_dl_loaded = NULL;
+}
+/* }}} */
+
 ZEND_API void zend_post_deactivate_modules(void) /* {{{ */
 {
 	if (EG(full_tables_cleanup)) {
@@ -3146,6 +3174,9 @@ ZEND_API void zend_post_deactivate_modules(void) /* {{{ */
 				break;
 			}
 			module_destructor(module);
+			if (module->handle) {
+				module_registry_unload(module);
+			}
 			zend_string_release_ex(key, 0);
 		} ZEND_HASH_MAP_FOREACH_END_DEL();
 	} else {

Zend/zend_modules.h

@@ -125,7 +125,7 @@ extern ZEND_API HashTable module_registry;
 
 void module_destructor(zend_module_entry *module);
 int module_registry_request_startup(zend_module_entry *module);
-int module_registry_unload_temp(const zend_module_entry *module);
+void module_registry_unload(const zend_module_entry *module);
 END_EXTERN_C()
 
 #endif

configure.ac

@@ -20,7 +20,7 @@ dnl Basic autoconf initialization, generation of config.nice.
 dnl ----------------------------------------------------------------------------
 
 AC_PREREQ([2.68])
-AC_INIT([PHP],[8.2.16],[https://github.com/php/php-src/issues],[php],[https://www.php.net])
+AC_INIT([PHP],[8.2.17],[https://github.com/php/php-src/issues],[php],[https://www.php.net])
 AC_CONFIG_SRCDIR([main/php_version.h])
 AC_CONFIG_AUX_DIR([build])
 AC_PRESERVE_HELP_ORDER