summaryrefslogtreecommitdiff
path: root/ext/standard/info.c
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@php.net>2002-10-04 04:47:35 +0000
committerRasmus Lerdorf <rasmus@php.net>2002-10-04 04:47:35 +0000
commit989a61ed98f1865ac926d114448f0ebfa3a8ec43 (patch)
treec444efa3d6efd8a0f367b5251ff0092ef7da95bf /ext/standard/info.c
parent114dff39cefe7cdfddf6b4381da5c1c6f07e507f (diff)
downloadphp-git-989a61ed98f1865ac926d114448f0ebfa3a8ec43.tar.gz
As discussed, add --with-config-file-scan-dir compile-time switch defining
a directory which will be scanned for *.ini files after the main php.ini file has been parsed. This makes it much easier to automatically deploy a modular PHP since adding extensions which have their own ini switches can now be done by simply dropping a foo.ini file in the right directory and restarting. A list of parsed ini files is maintained and shown on the phpinfo page.
Diffstat (limited to 'ext/standard/info.c')
-rw-r--r--ext/standard/info.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/ext/standard/info.c b/ext/standard/info.c
index 59157a5e41..8d3b76a51b 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -59,6 +59,7 @@ ZEND_EXTERN_MODULE_GLOBALS(iconv)
} \
PHPAPI extern char *php_ini_opened_path;
+PHPAPI extern char *php_ini_scanned_files;
/* {{{ _display_module_info
*/
@@ -378,6 +379,13 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
#endif
php_info_print_table_row(2, "Configuration File (php.ini) Path", php_ini_opened_path?php_ini_opened_path:PHP_CONFIG_FILE_PATH);
+
+ 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);