We need to initialize the utility values after we initialize the INI file, which in

turn, is after we initialize Zend.  Set the utility values separately from Zend's
initialization

diff --git a/Zend/zend.c b/Zend/zend.c
index e84a1af549ed5d86069d8a7e4da6155c346f1a27..485256beaef489269a02b173fdec31ea34692893 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -158,7 +158,7 @@ static void register_standard_class()
 }
 
 
-int zend_startup(zend_utility_functions *utility_functions, zend_utility_values *utility_values, char **extensions)
+int zend_startup(zend_utility_functions *utility_functions, char **extensions)
 {
        start_memory_manager();
 
@@ -176,7 +176,6 @@ int zend_startup(zend_utility_functions *utility_functions, zend_utility_values
        zend_compile_files = compile_files;
        zend_execute = execute;
 
-       zend_uv = *utility_values;
        zend_llist_init(&zend_extensions, sizeof(zend_extension), (void (*)(void *)) zend_extension_dtor, 1);
 
        /* set up version */
@@ -213,6 +212,12 @@ void zend_shutdown()
 }
 
 
+void zend_set_utility_values(zend_utility_values *utility_values)
+{
+       zend_uv = *utility_values;
+}
+
+
 /* this should be compatible with the standard zenderror */
 void zenderror(char *error)
 {

diff --git a/Zend/zend.h b/Zend/zend.h
index a2395a9ec0e96c26974c94bce8beb6426825efb0..c651c38e1c77cda6ac106b3ae967e1066757cb8a 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -153,8 +153,9 @@ typedef struct {
 #define IS_CONSTANT    9
 #define IS_METHOD      10 /* for overloaded function calls */
 
-int zend_startup(zend_utility_functions *utility_functions, zend_utility_values *utility_values, char **extensions);
+int zend_startup(zend_utility_functions *utility_functions, char **extensions);
 void zend_shutdown();
+void zend_set_utility_values(zend_utility_values *utility_values);
 ZEND_API void zend_bailout();
 ZEND_API char *get_zend_version();