diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2006-08-22 16:47:23 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2006-08-22 16:47:23 +0000 |
| commit | d4ff427c5584f6a4b8839287b9695a553aa75715 (patch) | |
| tree | a0cb86a4012fd56a9601119774e024183d46578e | |
| parent | 05a1ac2a3505d982a59107fae03e454a52a23a16 (diff) | |
| download | php-git-d4ff427c5584f6a4b8839287b9695a553aa75715.tar.gz | |
Fixed bug #38511, #38473, #38263 (Fixed session extension request shutdown
order to ensure it is shutdown before the extensions it may depend on).
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/date/php_date.c | 10 |
2 files changed, 12 insertions, 1 deletions
@@ -7,6 +7,9 @@ PHP NEWS inside a failed query executed via query() method). (Ilia) - Fixed bug #38524 (strptime() does not initialize the internal date storage structure). (Ilia) +- Fixed bug #38511, #38473, #38263 (Fixed session extension request shutdown + order to ensure it is shutdown before the extensions it may depend on). + (Ilia) - Fixed bug #38488 (Access to "php://stdin" and family crashes PHP on win32). (Dmitry) - Fixed PECL bug #8112 (OCI8 persistent connections misbehave when Apache diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 99edbc0f45..ad790ee545 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -299,9 +299,17 @@ static zend_object_value date_object_new_timezone(zend_class_entry *class_type T static zend_object_value date_object_clone_date(zval *this_ptr TSRMLS_DC); static zend_object_value date_object_clone_timezone(zval *this_ptr TSRMLS_DC); +/* This is need to ensure that session extension request shutdown occurs 1st, because it uses the date extension */ +static zend_module_dep date_deps[] = { + ZEND_MOD_OPTIONAL("session") + {NULL, NULL, NULL} +}; + /* {{{ Module struct */ zend_module_entry date_module_entry = { - STANDARD_MODULE_HEADER, + STANDARD_MODULE_HEADER_EX, + NULL, + date_deps, "date", /* extension name */ date_functions, /* function list */ PHP_MINIT(date), /* process startup */ |