iliaa Tue Aug 22 16:47:43 2006 UTC
Modified files:
/php-src/ext/date php_date.c
Log:
MFB: Fixed bug #38511, #38473, #38263 (Fixed session extension request
shutdown order to ensure it is shutdown before the extensions it may depend
on).
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.112&r2=1.113&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.112 php-src/ext/date/php_date.c:1.113
--- php-src/ext/date/php_date.c:1.112 Tue Aug 15 06:53:02 2006
+++ php-src/ext/date/php_date.c Tue Aug 22 16:47:43 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.112 2006/08/15 06:53:02 mike Exp $ */
+/* $Id: php_date.c,v 1.113 2006/08/22 16:47:43 iliaa Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -302,9 +302,17 @@
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 */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
