diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-08-28 19:57:57 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-08-28 19:57:57 +0000 |
| commit | 7384c12b11c30c816d75a0785eb612c0a33c79d8 (patch) | |
| tree | 8cd25a46d8b53193826d59023f7c11cc506a46a5 | |
| parent | ecfa8808209f116a7cf40c38987781d56e5a7808 (diff) | |
| download | php-git-7384c12b11c30c816d75a0785eb612c0a33c79d8.tar.gz | |
MFH: make sure ext/standard is down before ext/session (fixes #38534)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/standard/basic_functions.c | 8 |
2 files changed, 9 insertions, 1 deletions
@@ -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 */ |