* Add arguments to shutdown functions

* Remove traces of php_ini stuff

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 6ab30724579eaa8c2947c82d2fc3a7f701930e92..3dfea5f12102fee2de960a2eb1828c8ca70d672e 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -617,14 +617,14 @@ void module_destructor(zend_module_entry *module)
 #if 0
                zend_printf("%s:  Request shutdown\n",module->name);
 #endif
-               module->request_shutdown_func();
+               module->request_shutdown_func(module->type, module->module_number);
        }
        module->request_started=0;
        if (module->module_started && module->module_shutdown_func) {
 #if 0
                zend_printf("%s:  Module shutdown\n",module->name);
 #endif
-               module->module_shutdown_func();
+               module->module_shutdown_func(module->type, module->module_number);
        }
        module->module_started=0;
        unregister_functions(module->functions,-1);
@@ -662,7 +662,7 @@ int module_registry_cleanup(zend_module_entry *module)
 #if 0
                                zend_printf("%s:  Request shutdown\n",module->name);
 #endif
-                               module->request_shutdown_func();
+                               module->request_shutdown_func(module->type, module->module_number);
                        }
                        module->request_started=0;
                        return 0;

diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h
index 2aafdd3b0dc51880c12aaa9af269ef485f2fe718..ee0b879c541750c6e95eb4afadcd1213a86e0695 100644 (file)
--- a/Zend/zend_modules.h
+++ b/Zend/zend_modules.h
@@ -17,13 +17,10 @@
 #ifndef _MODULES_H
 #define _MODULES_H
 
-#define INIT_FUNC_ARGS int type, int module_number
+#define INIT_FUNC_ARGS         int type, int module_number
+#define SHUTDOWN_FUNC_ARGS     int type, int module_number
 
-#ifdef HAS_ZEND_INI_ENTRIES
 #define STANDARD_MODULE_PROPERTIES 0, 0, 0, NULL, 0
-#else
-#define STANDARD_MODULE_PROPERTIES 0, 0, 0, NULL, 0
-#endif
 
 
 #define MODULE_PERSISTENT 1
@@ -33,9 +30,9 @@ typedef struct {
        char *name;
        function_entry *functions;
        int (*module_startup_func)(INIT_FUNC_ARGS);
-       int (*module_shutdown_func)(void);
+       int (*module_shutdown_func)(SHUTDOWN_FUNC_ARGS);
        int (*request_startup_func)(INIT_FUNC_ARGS);
-       int (*request_shutdown_func)(void);
+       int (*request_shutdown_func)(SHUTDOWN_FUNC_ARGS);
        void (*info_func)(void);
        int request_started,module_started;
        unsigned char type;