]> granicus.if.org Git - php/commitdiff
Report configuration path that is really used, not that is compiled in
authorStanislav Malyshev <stas@php.net>
Tue, 25 Jul 2000 10:54:07 +0000 (10:54 +0000)
committerStanislav Malyshev <stas@php.net>
Tue, 25 Jul 2000 10:54:07 +0000 (10:54 +0000)
# it does matter when using -c option

ext/standard/info.c

index 83ff3d8356deb942d3322c2ea79dc53c6188b53d..42aaa17cd2913924fa2eebe378e3e695a8eec7b1 100644 (file)
@@ -39,7 +39,7 @@
 #define SECTION(name)  PUTS("<H2>" name "</H2>\n")
 
 #define CREDIT_LINE(module, authors) php_info_print_table_row(2, module, authors)
-
+PHPAPI extern char *php_ini_path;
 
 static int _display_module_info(zend_module_entry *module, void *arg)
 {
@@ -191,7 +191,7 @@ PHPAPI void php_print_info(int flag)
                php_info_print_table_row(2, "Virtual Directory Support", "disabled" );
 #endif
 
-               php_info_print_table_row(2, "Configuration File (php.ini) Path", CONFIGURATION_FILE_PATH );
+               php_info_print_table_row(2, "Configuration File (php.ini) Path", php_ini_path?php_ini_path:CONFIGURATION_FILE_PATH );
 
 #if ZEND_DEBUG
                php_info_print_table_row(2, "ZEND_DEBUG", "enabled" );