Fix a bug in the resource dispencer

diff --git a/Zend/zend.c b/Zend/zend.c
index 99a836ccaa579b2d535d61d35015f514169e8598..6e03c91b83eb51cb6b6bb3adbebf6a9bb61aa2ca 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -327,7 +327,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i
        zend_v_compile_files = v_compile_files;
        zend_execute = execute;
 
-       zend_llist_init(&zend_extensions, sizeof(zend_extension), (void (*)(void *)) zend_extension_dtor, 1);
+       zend_startup_extensions();
 
        /* set up version */
        zend_version_info = strdup(ZEND_CORE_VERSION_INFO);

diff --git a/Zend/zend_extensions.c b/Zend/zend_extensions.c
index ee69ef380e2cdcc9fd798c88d19cb2e803a01ef1..de5df36157483e667e0bb9b4d12568d21e319b42 100644 (file)
--- a/Zend/zend_extensions.c
+++ b/Zend/zend_extensions.c
@@ -21,7 +21,7 @@
 #include "zend_extensions.h"
 
 ZEND_API zend_llist zend_extensions;
-static int last_resource_number=0;
+static int last_resource_number;
 
 int zend_load_extensions(char **extension_paths)
 {
@@ -143,6 +143,14 @@ static void zend_extension_shutdown(zend_extension *extension)
 }
 
 
+int zend_startup_extensions()
+{
+       zend_llist_init(&zend_extensions, sizeof(zend_extension), (void (*)(void *)) zend_extension_dtor, 1);
+       last_resource_number = 0;
+       return SUCCESS;
+}
+
+
 void zend_shutdown_extensions()
 {
        zend_llist_apply(&zend_extensions, (void (*)(void *)) zend_extension_shutdown);

diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h
index 34f83b1f4046ba4f2f819024af5a0b83fdbaec9a..83cbfabd200af648f052ac188f3fd1dce2e5c22d 100644 (file)
--- a/Zend/zend_extensions.h
+++ b/Zend/zend_extensions.h
@@ -92,6 +92,7 @@ ZEND_API int zend_load_extension(char *path);
 ZEND_API int zend_load_extensions(char **extension_paths);
 ZEND_API int zend_register_extension(zend_extension *new_extension, DL_HANDLE handle);
 void zend_append_version_info(zend_extension *extension);
+int zend_startup_extensions(void);
 void zend_shutdown_extensions(void);
 
 #endif /* _ZEND_EXTENSIONS_H */