Browse Source

MFH: Fixed module loading order and made request shutdown functions also to

be loaded in reverse like all other shutdowns are.
PHP-5.2.1RC1
Jani Taskinen 17 years ago
parent
commit
71b329c703
  1. 2
      Zend/zend.c
  2. 3
      build/order_by_dep.awk
  3. 0
      ext/date/config0.m4
  4. 10
      ext/date/php_date.c

2
Zend/zend.c

@ -835,7 +835,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();
}

3
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);
}

0
ext/date/config.m4 → ext/date/config0.m4

10
ext/date/php_date.c

@ -18,6 +18,8 @@
/* $Id$ */
#define _ISOC9X_SOURCE
#include "php.h"
#include "php_streams.h"
#include "php_main.h"
@ -316,17 +318,11 @@ static zend_object_value date_object_clone_date(zval *this_ptr TSRMLS_DC);
static int date_object_compare_date(zval *d1, zval *d2 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_EX,
NULL,
date_deps,
NULL,
"date", /* extension name */
date_functions, /* function list */
PHP_MINIT(date), /* process startup */

Loading…
Cancel
Save