Re: main/main.c - php_module_startup && additional modules

Hi, Please send me the diff as an attachment and change zend_module_entry *start_extensions[num_additional_modules]; to use do_alloca(), free_alloca(). I will then commit to HEAD. Thanks, Andi At 08:42 AM 12/9/2004 +0100, Wojtek Meler wrote:

Here you are. Andi Gutmans wrote:

I was thinking about adding those two lines.

Index: main.c =================================================================== RCS file: /repository/php-src/main/main.c,v retrieving revision 1.512.2.56 diff -u -r1.512.2.56 main.c

--- main.c      1 Oct 2004 14:27:13 -0000       1.512.2.56
+++ main.c      9 Dec 2004 07:40:22 -0000

@@ -1061,6 +1061,7 @@

        int module_number=0;    /* for REGISTER_INI_ENTRIES() */
        char *php_os;
        int i;
+       zend_module_entry *start_extensions[num_additional_modules]; /* additional_modules don't fit to php_startup_extensions signature */

#ifdef ZTS

        zend_executor_globals *executor_globals;
        void ***tsrm_ls;

@@ -1218,8 +1219,10 @@

                php_printf("Unable to start builtin modules\n");
                return FAILURE;
        }
+       /* we have to fit args to php_startup_extensions signature  */
+       for (i=0;i<num_additional_modules;i++) start_extensions[i]=&additional_modules[i];
        /* start additional PHP extensions */
-       php_startup_extensions(&additional_modules, num_additional_modules);
+       php_startup_extensions(start_extensions, num_additional_modules);

        /* load and startup extensions compiled as shared objects (aka DLLs)