diff options
| author | Zeev Suraski <zeev@php.net> | 2000-12-27 15:43:05 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-12-27 15:43:05 +0000 |
| commit | 338b9b08195517b8996e85977f3970667b0c9c4c (patch) | |
| tree | 753984e3cf9933b383eb52a2445f72cea0480cc7 /main/php_ini.c | |
| parent | 34f5c0c36d03f92c30c4d8e36007e33d826438ac (diff) | |
| download | php-git-338b9b08195517b8996e85977f3970667b0c9c4c.tar.gz | |
- Make the INI mechanism thread safe (fix necessary API changes from Zend)
- Make the Win32 non-TS configuration build again
Diffstat (limited to 'main/php_ini.c')
| -rw-r--r-- | main/php_ini.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index 0c374ea95a..8c1b08c40b 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -77,6 +77,7 @@ static int php_ini_displayer(zend_ini_entry *ini_entry, int module_number) PHPAPI void display_ini_entries(zend_module_entry *module) { int module_number; + ELS_FETCH(); if (module) { module_number = module->module_number; @@ -85,7 +86,7 @@ PHPAPI void display_ini_entries(zend_module_entry *module) } php_info_print_table_start(); php_info_print_table_header(3, "Directive", "Local Value", "Master Value"); - zend_ini_apply_with_argument((apply_func_arg_t) php_ini_displayer, (void *) (long) module_number); + zend_hash_apply_with_argument(&EG(ini_directives), (apply_func_arg_t) php_ini_displayer, (void *) (long) module_number); php_info_print_table_end(); } |