diff options
| -rw-r--r-- | Zend/zend.c | 2 | ||||
| -rw-r--r-- | build/order_by_dep.awk | 3 | ||||
| -rw-r--r-- | ext/date/config0.m4 (renamed from ext/date/config.m4) | 0 | ||||
| -rw-r--r-- | ext/date/php_date.c | 8 |
4 files changed, 3 insertions, 10 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 4efcae6615..09524bcb4a 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -863,7 +863,7 @@ void zend_deactivate_modules(TSRMLS_D) /* {{{ */ EG(opline_ptr) = NULL; /* we're no longer executing anything */ zend_try { - zend_hash_apply(&module_registry, (apply_func_t) module_registry_cleanup TSRMLS_CC); + zend_hash_reverse_apply(&module_registry, (apply_func_t) module_registry_cleanup TSRMLS_CC); } zend_end_try(); } /* }}} */ diff --git a/build/order_by_dep.awk b/build/order_by_dep.awk index 38128b2e1b..487d055723 100644 --- a/build/order_by_dep.awk +++ b/build/order_by_dep.awk @@ -79,8 +79,7 @@ END { out_count = 0; while (count(mods)) { - # count down, since we need to assemble it in reverse order - for (i = mod_count-1; i >= 0; --i) { + for (i = 0; i <= mod_count; i++) { if (i in mods) { do_deps(i); } diff --git a/ext/date/config.m4 b/ext/date/config0.m4 index f403104a8a..f403104a8a 100644 --- a/ext/date/config.m4 +++ b/ext/date/config0.m4 diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 3906dbb2bb..614aac889f 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -563,17 +563,11 @@ static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC); zval *date_interval_read_property(zval *object, zval *member, int type TSRMLS_DC); void date_interval_write_property(zval *object, zval *member, zval *value TSRMLS_DC); -/* This is need to ensure that session extension request shutdown occurs 1st, because it uses the date extension */ -static const zend_module_dep date_deps[] = { - ZEND_MOD_OPTIONAL("session") - {NULL, NULL, NULL} -}; - /* {{{ Module struct */ zend_module_entry date_module_entry = { STANDARD_MODULE_HEADER_EX, NULL, - date_deps, + NULL, "date", /* extension name */ date_functions, /* function list */ PHP_MINIT(date), /* process startup */ |