Fixed bug #38511, #38473, #38263 (Fixed session extension request shutdown

order to ensure it is shutdown before the extensions it may depend on).

diff --git a/NEWS b/NEWS
index 1bcdf8f2d6a7bc30c5d59fe16290c6c6d801376e..b779f31419cfa67f8c833066597a6f280b3b92ca 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 99edbc0f453ea99da651242dad414b85131edd56..ad790ee545648c062ff37e233f2a1d26080c21b1 100644 (file)
--- 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 */