From 7384c12b11c30c816d75a0785eb612c0a33c79d8 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Mon, 28 Aug 2006 19:57:57 +0000 Subject: [PATCH] MFH: make sure ext/standard is down before ext/session (fixes #38534) --- NEWS | 2 ++ ext/standard/basic_functions.c | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index cbd27f78e0..b14cc36b9c 100644 --- 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 6342e0f09a..a0e42e3286 100644 --- 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 */ -- 2.50.1