- Change zend_startup to accept a flag for starting builtin functions

diff --git a/Zend/zend.c b/Zend/zend.c
index c3378f40d92234b831339416602630bb85630387..3f18b9284ee53fd1c534cf62dd97f37ca6a86cca 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -284,7 +284,7 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals)
 #endif
 
 
-int zend_startup(zend_utility_functions *utility_functions, char **extensions)
+int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions)
 {
 #ifdef ZTS
        zend_compiler_globals *compiler_globals;
@@ -351,7 +351,9 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions)
        init_resource_plist(ELS_C);
 #endif
 
-       zend_startup_builtin_functions();
+       if (start_builtin_functions) {
+               zend_startup_builtin_functions();
+       }
 
        return SUCCESS;
 }

diff --git a/Zend/zend.h b/Zend/zend.h
index 69b576facbe5c8ce0aaf4bf238c63a5d31682167..9d77316a7e8f36732eb25c8e1827f2bb35c279e7 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -262,7 +262,7 @@ typedef struct _zend_utility_values {
 #define BYREF_ALLOW 2
 #define BYREF_FORCE_REST 3
 
-int zend_startup(zend_utility_functions *utility_functions, char **extensions);
+int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions);
 void zend_shutdown(void);
 
 void zend_set_utility_values(zend_utility_values *utility_values);