sniper Mon Apr 2 12:41:08 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard info.c
Log:
- Changed phpinfo() to make difference between set php.ini path and what was
actually loaded.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.10&r2=1.249.2.10.2.11&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.10
php-src/ext/standard/info.c:1.249.2.10.2.11
--- php-src/ext/standard/info.c:1.249.2.10.2.10 Thu Feb 8 16:55:34 2007
+++ php-src/ext/standard/info.c Mon Apr 2 12:41:07 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: info.c,v 1.249.2.10.2.10 2007/02/08 16:55:34 helly Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.11 2007/04/02 12:41:07 sniper Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -474,7 +474,8 @@
php_info_print_table_row(2, "Virtual Directory Support",
"disabled" );
#endif
- php_info_print_table_row(2, "Configuration File (php.ini)
Path", php_ini_opened_path?php_ini_opened_path:PHP_CONFIG_FILE_PATH);
+ 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)");
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
