Restored old behavior of zend_statup_module()

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index fbb2e5269de15451bf8e9f45448fa529dd0626b2..eef2254172e2d05109b7dd3a80dd9aff2005adb5 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1240,7 +1240,7 @@ ZEND_API int add_property_zval_ex(zval *arg, char *key, uint key_len, zval *valu
        return SUCCESS;
 }
 
-ZEND_API int zend_startup_module(zend_module_entry *module TSRMLS_DC)
+ZEND_API int zend_startup_module_ex(zend_module_entry *module TSRMLS_DC)
 {
        int name_len;
        char *lcname;
@@ -1324,7 +1324,7 @@ try_again:
 ZEND_API int zend_startup_modules(TSRMLS_D)
 {
        zend_hash_sort(&module_registry, zend_sort_modules, NULL, 0 TSRMLS_CC);
-       zend_hash_apply(&module_registry, (apply_func_t)zend_startup_module TSRMLS_CC);
+       zend_hash_apply(&module_registry, (apply_func_t)zend_startup_module_ex TSRMLS_CC);
        return SUCCESS;
 }
 
@@ -1630,12 +1630,12 @@ ZEND_API void zend_unregister_functions(zend_function_entry *functions, int coun
 }
 
 
-ZEND_API int zend_register_module(zend_module_entry *module)
+ZEND_API int zend_startup_module(zend_module_entry *module)
 {
        TSRMLS_FETCH();
        
-       if (zend_register_module_ex(module TSRMLS_CC) == SUCCESS &&
-           zend_startup_module(module TSRMLS_CC) == SUCCESS) {
+       if (zend_register_internal_module(module TSRMLS_CC) == SUCCESS &&
+           zend_startup_module_ex(module TSRMLS_CC) == SUCCESS) {
                return SUCCESS;
        }
        return FAILURE;

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index f7f6bcac57894d74375a8089368b5a279bf06509..2a967fd60287999241705884eb6648f6116c5e95 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -172,10 +172,10 @@ ZEND_API int zend_parse_method_parameters_ex(int flags, int num_args TSRMLS_DC,
 
 ZEND_API int zend_register_functions(zend_class_entry *scope, zend_function_entry *functions, HashTable *function_table, int type TSRMLS_DC);
 ZEND_API void zend_unregister_functions(zend_function_entry *functions, int count, HashTable *function_table TSRMLS_DC);
-ZEND_API int zend_register_module(zend_module_entry *module_entry);
+ZEND_API int zend_startup_module(zend_module_entry *module_entry);
 ZEND_API int zend_register_internal_module(zend_module_entry *module_entry TSRMLS_DC);
 ZEND_API int zend_register_module_ex(zend_module_entry *module TSRMLS_DC);
-ZEND_API int zend_startup_module(zend_module_entry *module TSRMLS_DC);
+ZEND_API int zend_startup_module_ex(zend_module_entry *module TSRMLS_DC);
 ZEND_API int zend_startup_modules(TSRMLS_D);
 ZEND_API void zend_check_magic_method_implementation(zend_class_entry *ce, zend_function *fptr, int error_type TSRMLS_DC);
 

diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index 5d83fc745190940d67913241e84a6f8fdc37ea42..65cc533b6144b7cdcd55433084b9cb0cab27e2ec 100644 (file)
--- a/ext/standard/dl.c
+++ b/ext/standard/dl.c
@@ -224,7 +224,7 @@ void php_dl(zval *file, int type, zval *return_value TSRMLS_DC)
                RETURN_FALSE;
        }
 
-       if (type == MODULE_TEMPORARY && zend_startup_module(module_entry TSRMLS_CC) == FAILURE) {
+       if (type == MODULE_TEMPORARY && zend_startup_module_ex(module_entry TSRMLS_CC) == FAILURE) {
                DL_UNLOAD(handle);
                RETURN_FALSE;
        }