File tree Expand file tree Collapse file tree 4 files changed +3
-10
lines changed Expand file tree Collapse file tree 4 files changed +3
-10
lines changed Original file line number Diff line number Diff line change @@ -863,7 +863,7 @@ void zend_deactivate_modules(TSRMLS_D) /* {{{ */
863
863
EG (opline_ptr ) = NULL ; /* we're no longer executing anything */
864
864
865
865
zend_try {
866
- zend_hash_apply (& module_registry , (apply_func_t ) module_registry_cleanup TSRMLS_CC );
866
+ zend_hash_reverse_apply (& module_registry , (apply_func_t ) module_registry_cleanup TSRMLS_CC );
867
867
} zend_end_try ();
868
868
}
869
869
/* }}} */
Original file line number Diff line number Diff line change 79
79
out_count = 0 ;
80
80
81
81
while (count(mods)) {
82
- # count down, since we need to assemble it in reverse order
83
- for (i = mod_count- 1 ; i >= 0 ; -- i) {
82
+ for (i = 0 ; i <= mod_count; i++ ) {
84
83
if (i in mods) {
85
84
do_deps(i);
86
85
}
File renamed without changes.
Original file line number Diff line number Diff line change @@ -563,17 +563,11 @@ static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC);
563
563
zval * date_interval_read_property (zval * object , zval * member , int type TSRMLS_DC );
564
564
void date_interval_write_property (zval * object , zval * member , zval * value TSRMLS_DC );
565
565
566
- /* This is need to ensure that session extension request shutdown occurs 1st, because it uses the date extension */
567
- static const zend_module_dep date_deps [] = {
568
- ZEND_MOD_OPTIONAL ("session" )
569
- {NULL , NULL , NULL }
570
- };
571
-
572
566
/* {{{ Module struct */
573
567
zend_module_entry date_module_entry = {
574
568
STANDARD_MODULE_HEADER_EX ,
575
569
NULL ,
576
- date_deps ,
570
+ NULL ,
577
571
"date" , /* extension name */
578
572
date_functions , /* function list */
579
573
PHP_MINIT (date ), /* process startup */
You can’t perform that action at this time.
0 commit comments