Merge branch 'PHP-8.2'

bwoebi · bwoebi · commit 81c33eebcb42 · 2022-11-09T17:52:01.000+01:00
diff --git a/ext/standard/dl.c b/ext/standard/dl.c
@@ -206,8 +206,8 @@ PHPAPI int php_load_extension(const char *filename, int type, int start_now)
 	}
 	module_entry = get_module();
 	if (zend_hash_str_exists(&module_registry, module_entry->name, strlen(module_entry->name))) {
-		DL_UNLOAD(handle);
 		zend_error(E_CORE_WARNING, "Module \"%s\" is already loaded", module_entry->name);
+		DL_UNLOAD(handle);
 		return FAILURE;
 	}
 	if (module_entry->zend_api != ZEND_MODULE_API_NO) {

Original file line number	Diff line number	Diff line change
`@@ -206,8 +206,8 @@ PHPAPI int php_load_extension(const char *filename, int type, int start_now)`
`206`	`206`	`}`
`207`	`207`	`module_entry = get_module();`
`208`	`208`	`if (zend_hash_str_exists(&module_registry, module_entry->name, strlen(module_entry->name))) {`
`209`		`- DL_UNLOAD(handle);`
`210`	`209`	`zend_error(E_CORE_WARNING, "Module \"%s\" is already loaded", module_entry->name);`
	`210`	`+ DL_UNLOAD(handle);`
`211`	`211`	`return FAILURE;`
`212`	`212`	`}`
`213`	`213`	`if (module_entry->zend_api != ZEND_MODULE_API_NO) {`