Allow module startup to be separate from the compiler/executor startup

diff --git a/Zend/zend.c b/Zend/zend.c
index 1e83925874e7c99622ec06cf103f805e7d978c5a..de6bf93ecdc6bb353f4b39829934b5829135903c 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -447,6 +447,13 @@ void zend_activate(CLS_D ELS_DC)
        startup_scanner(CLS_C);
 }
 
+
+void zend_activate_modules()
+{
+       zend_hash_apply(&module_registry, (int (*)(void *)) module_registry_request_startup);
+}
+
+
 void zend_deactivate(CLS_D ELS_DC)
 {
        zend_hash_apply(&module_registry, (int (*)(void *)) module_registry_cleanup);

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 66176f2c72cc608a2398d0befb51420ed7e30fa8..badda32a90127dd1f0302e9b6a6293e53a07c06a 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -101,7 +101,6 @@ void init_compiler(CLS_D ELS_DC)
        CG(asp_tags) = ZEND_UV(asp_tags);
        CG(allow_call_time_pass_reference) = ZEND_UV(allow_call_time_pass_reference);
        CG(handle_op_arrays) = 1;
-       zend_hash_apply(&module_registry, (int (*)(void *)) module_registry_request_startup);
        init_resource_list(ELS_C);
        CG(unclean_shutdown) = 0;
        zend_llist_init(&CG(open_files), sizeof(zend_file_handle), (void (*)(void *)) zend_open_file_dtor, 0);

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 84d9556883831a2e6122757135adbb49982c3afb..2b95d352fe7390c3423ae9cbcc33fe5cf51bd605 100644 (file)
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -198,6 +198,8 @@ extern ZEND_API zend_op_array *(*zend_compile_files)(int mark_as_ref CLS_DC, int
 
 void zend_activate(CLS_D ELS_DC);
 void zend_deactivate(CLS_D ELS_DC);
+void zend_activate_modules();
+
 
 int lex_scan(zval *zendlval CLS_DC);
 void startup_scanner(CLS_D);