diff options
| author | Jani Taskinen <jani@php.net> | 2008-08-13 00:53:28 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2008-08-13 00:53:28 +0000 |
| commit | e5e6f553a25f972500b792170e03b5903ee924dd (patch) | |
| tree | 4064bc661598ee9214a8517543b249c8d4d0dca0 /ext/standard/info.c | |
| parent | f87d4530c299167f04a4d2cc076edb2432be3280 (diff) | |
| download | php-git-e5e6f553a25f972500b792170e03b5903ee924dd.tar.gz | |
MFH
Diffstat (limited to 'ext/standard/info.c')
| -rw-r--r-- | ext/standard/info.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ext/standard/info.c b/ext/standard/info.c index 11c664fbfd..85b8be25cd 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -57,6 +57,7 @@ ZEND_EXTERN_MODULE_GLOBALS(iconv) } \ PHPAPI extern char *php_ini_opened_path; +PHPAPI extern char *php_ini_scanned_path; PHPAPI extern char *php_ini_scanned_files; static int php_info_write_wrapper(const char *str, uint str_length) @@ -483,14 +484,9 @@ PHPAPI void php_print_info(int flag TSRMLS_DC) php_info_print_table_row(2, "Configuration File (php.ini) Path", PHP_CONFIG_FILE_PATH); php_info_print_table_row(2, "Loaded Configuration File", php_ini_opened_path ? php_ini_opened_path : "(none)"); + php_info_print_table_row(2, "Scan this dir for additional .ini files", php_ini_scanned_path ? php_ini_scanned_path : "(none)"); + php_info_print_table_row(2, "additional .ini files parsed", php_ini_scanned_files ? php_ini_scanned_files : "(none)"); - if (strlen(PHP_CONFIG_FILE_SCAN_DIR)) { - php_info_print_table_row(2, "Scan this dir for additional .ini files", PHP_CONFIG_FILE_SCAN_DIR); - if (php_ini_scanned_files) { - php_info_print_table_row(2, "additional .ini files parsed", php_ini_scanned_files); - } - } - snprintf(temp_api, sizeof(temp_api), "%d", PHP_API_VERSION); php_info_print_table_row(2, "PHP API", temp_api); |