From: Zeev Suraski <zeev@php.net>
Date: Sun, 16 Jan 2000 19:41:15 +0000 (+0000)
Subject: Allow module startup to be separate from the compiler/executor startup
X-Git-Tag: BEFORE_PRE_SHUTDOWN_REVERSE_PATCH~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc0e6632415b32f73e53c5c280e8462e817cc9ba;p=php

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

diff --git a/Zend/zend.c b/Zend/zend.c
index 1e83925874..de6bf93ecd 100644
--- 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 66176f2c72..badda32a90 100644
--- 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 84d9556883..2b95d352fe 100644
--- 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);