diff options
| author | Zeev Suraski <zeev@php.net> | 2002-09-18 21:57:42 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2002-09-18 21:57:42 +0000 |
| commit | 76312b4508b43ed2cebd97b749e9e90181e55073 (patch) | |
| tree | de244c23b518eff0488eb3a965b21e2522ee0454 /main/main.c | |
| parent | 70f17979fb7ac0c7379a48bc86d26a009cfb56ed (diff) | |
| download | php-git-76312b4508b43ed2cebd97b749e9e90181e55073.tar.gz | |
another startup initialization fix - only ISAPI and CGI SAPI's tested,
minor compile buglets might occur in other SAPIs, but should be trivial
to fix...
Diffstat (limited to 'main/main.c')
| -rw-r--r-- | main/main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/main/main.c b/main/main.c index 18d83c10fa..1306414dd0 100644 --- a/main/main.c +++ b/main/main.c @@ -966,7 +966,7 @@ int php_startup_extensions(zend_module_entry **ptr, int count) /* {{{ php_module_startup */ -int php_module_startup(sapi_module_struct *sf) +int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_modules, uint num_additional_modules) { zend_utility_functions zuf; zend_utility_values zuv; @@ -1118,6 +1118,9 @@ int php_module_startup(sapi_module_struct *sf) php_printf("Unable to start builtin modules\n"); return FAILURE; } + /* start additional PHP extensions */ + php_startup_extensions(&additional_modules, num_additional_modules); + /* load and startup extensions compiled as shared objects (aka DLLs) as requested by php.ini entries @@ -1131,6 +1134,7 @@ int php_module_startup(sapi_module_struct *sf) /* disable certain functions as requested by php.ini */ php_disable_functions(TSRMLS_C); + /* start Zend extensions */ zend_startup_extensions(); #ifdef ZTS |