From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 22 Aug 2006 16:47:43 +0000 (+0000)
Subject: MFB: Fixed bug #38511, #38473, #38263 (Fixed session extension request
X-Git-Tag: RELEASE_1_0_0RC1~1909
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=994cf483e18d130c8ab6f37ab1ed41412db2602a;p=php

MFB: 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/ext/date/php_date.c b/ext/date/php_date.c
index 116e9cac7d..aad77c1815 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -302,9 +302,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 */