diff options
author | valmat <ufabiz@gmail.com> | 2014-04-09 12:00:33 +0600 |
---|---|---|
committer | valmat <ufabiz@gmail.com> | 2014-04-09 12:00:33 +0600 |
commit | 21ba3f0aae94206457327552666d75dd2cf0a8f2 (patch) | |
tree | 266b24a9d549189d4a20f1db45d8edc771e32fca /zend/extensionimpl.cpp | |
parent | 6c7c846edd5b74450b76532da33c25e6cc6a10a4 (diff) |
Made compatible. Now works in the new structure of the library.
Diffstat (limited to 'zend/extensionimpl.cpp')
-rw-r--r-- | zend/extensionimpl.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/zend/extensionimpl.cpp b/zend/extensionimpl.cpp index 3534cdb..545b590 100644 --- a/zend/extensionimpl.cpp +++ b/zend/extensionimpl.cpp @@ -116,17 +116,12 @@ int ExtensionImpl::processStartup(int type, int module_number TSRMLS_DC) auto *extension = find(module_number TSRMLS_CC); // array contains ini settings - static zend_ini_entry *ini_entries = new zend_ini_entry[ extension->_ini_entries.size()+1 ]; + static zend_ini_entry *ini_entries = new zend_ini_entry[ extension->_data->ini_size()+1 ]; - // Filling ini_entries - unsigned int Ind = 0; - for (auto &ini : extension->_ini_entries) ini->fill(&ini_entries[Ind++], module_number); - - // add last empty ini entry (Zend, for some reason, it requires) - zend_ini_entry empty_entry { 0, 0, nullptr, 0, nullptr, nullptr, nullptr, nullptr, nullptr, 0, nullptr, 0, 0, 0, nullptr }; - ini_entries[Ind] = empty_entry; + // Filling ini entries + extension->_data->fill_ini(ini_entries, module_number); - // register + // register ini entries in Zend core REGISTER_INI_ENTRIES(); // initialize the extension |