diff options
| author | Zeev Suraski <zeev@php.net> | 2000-10-30 23:39:14 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-10-30 23:39:14 +0000 |
| commit | 78194a47b7ad76aaea3bb8e91fa0f5707ae88d00 (patch) | |
| tree | fe0a66d9f67176d1cce99994d09770141827c428 /ext/standard/basic_functions.c | |
| parent | 4171da016ce465832d32196e3b8eed014c073704 (diff) | |
| download | php-git-78194a47b7ad76aaea3bb8e91fa0f5707ae88d00.tar.gz | |
- Complete the move to the new INI parser. (Side effect: at last, people
can finally have spaces and tabs in their extension statements...)
Diffstat (limited to 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 1477cbbc20..a952c8576a 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -2402,14 +2402,15 @@ PHP_FUNCTION(parse_ini_file) } convert_to_string_ex(filename); - fh.handle.fp = V_FOPEN((*filename)->value.str.val, "r"); + fh.handle.fp = V_FOPEN(Z_STRVAL_PP(filename), "r"); if (!fh.handle.fp) { php_error(E_WARNING,"Cannot open '%s' for reading", (*filename)->value.str.val); return; } fh.type = ZEND_HANDLE_FP; + fh.filename = Z_STRVAL_PP(filename); array_init(return_value); - zend_parse_ini_file(&fh, ini_parser_cb, return_value); + zend_parse_ini_file(&fh, 0, ini_parser_cb, return_value); } /* }}} */ |