MFH: make sure ext/standard is down before ext/session (fixes #38534)

diff --git a/NEWS b/NEWS
index cbd27f78e0c6ce45ffc98a66b173c061a649181f..b14cc36b9c85808ee46e4195567bfc30a4571cb4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,8 @@ PHP                                                                        NEWS
   low). (Dmitry)
 - Fixed bug #38535 (memory corruption in pdo_pgsql driver on error retrieval
   inside a failed query executed via query() method). (Ilia)
+- Fixed bug #38534 (segfault when calling setlocale() in userspace session 
+  handler). (Tony)
 - Fixed bug #38524 (strptime() does not initialize the internal date storage
   structure). (Ilia)
 - Fixed bug #38511, #38473, #38263 (Fixed session extension request shutdown

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 6342e0f09a3d852889fc58376f6fb43f0a1475a6..a0e42e32869fbdc5607076abcef5d1076f279cc5 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -3800,9 +3800,15 @@ PHP_INI_BEGIN()
        PHP_INI_ENTRY_EX("safe_mode_allowed_env_vars",   SAFE_MODE_ALLOWED_ENV_VARS,   PHP_INI_SYSTEM, OnUpdateSafeModeAllowedEnvVars,   NULL)
 PHP_INI_END()
 
+static zend_module_dep standard_deps[] = {
+       ZEND_MOD_OPTIONAL("session")
+       {NULL, NULL, NULL}
+};
 
 zend_module_entry basic_functions_module = {
-    STANDARD_MODULE_HEADER,
+    STANDARD_MODULE_HEADER_EX,
+       NULL,
+       standard_deps,
        "standard",                                     /* extension name */
        basic_functions,                        /* function list */
        PHP_MINIT(basic),                       /* process startup */