- Sync with HEAD, no ability to not start builtin functions

diff --git a/Zend/zend.c b/Zend/zend.c
index 5e76ca453aadc1691351b47246a669ea4d137729..f3b702c86713abf4da568b08acbb2f4e73ce0aef 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -588,7 +588,7 @@ static void php_scanner_globals_ctor(zend_php_scanner_globals *scanner_globals_p
 
 void zend_init_opcodes_handlers(void);
 
-int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions TSRMLS_DC) /* {{{ */
+int zend_startup(zend_utility_functions *utility_functions, char **extensions TSRMLS_DC) /* {{{ */
 {
 #ifdef ZTS
        zend_compiler_globals *compiler_globals;
@@ -685,10 +685,8 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i
        EG(user_error_handler) = NULL;
        EG(user_exception_handler) = NULL;
 #endif
-       if (start_builtin_functions) {
-               zend_startup_builtin_functions(TSRMLS_C);
-       }
 
+       zend_startup_builtin_functions(TSRMLS_C);
        zend_register_standard_constants(TSRMLS_C);
        zend_register_auto_global("GLOBALS", sizeof("GLOBALS") - 1, NULL TSRMLS_CC);
 

diff --git a/Zend/zend.h b/Zend/zend.h
index 008d163999398308c87e678d01338c5bf74d7cba..a04219c0bb729f94ef95b7d04521799ac697590c 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -526,7 +526,7 @@ typedef int (*zend_write_func_t)(const char *str, uint str_length);
 #define OE_IS_OBJECT   (1<<1)
 #define OE_IS_METHOD   (1<<2)
 
-int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions TSRMLS_DC);
+int zend_startup(zend_utility_functions *utility_functions, char **extensions TSRMLS_DC);
 void zend_shutdown(TSRMLS_D);
 void zend_register_standard_ini_entries(TSRMLS_D);
 void zend_post_startup(TSRMLS_D);

diff --git a/main/main.c b/main/main.c
index 2e6bffd96db83e914b11edeee8dc70bfae5015ad..f33fb83ffc2c22ff8afab149d6baf9501b7358da 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -1738,7 +1738,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
        zuf.vspprintf_function = vspprintf;
        zuf.getenv_function = sapi_getenv;
        zuf.resolve_path_function = php_resolve_path_for_zend;
-       zend_startup(&zuf, NULL, 1 TSRMLS_CC);
+       zend_startup(&zuf, NULL TSRMLS_CC);
 
 #ifdef ZTS
        executor_globals = ts_resource(executor_globals_id);