- fix #48831 php -i has different output to php --ini

diff --git a/NEWS b/NEWS
index 7923f296480bef0049842c3bd749af7a78e2f0ab..28fa9a9e5db4ee0ce174fc2d14b10547c2b2dec9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -87,6 +87,8 @@
 - Fixed bug #50524 (proc_open on Windows does not respect cwd as it does on
   other platforms). (Pierre)
 - Fixed bug #49215 (make fails on glob_wrapper). (Felipe)
+- Fixed bug #48831 (php -i has different output to php --ini). (Richard, 
+  Pierre)
 
 22 Jul 2010, PHP 5.3.3
 - Upgraded bundled sqlite to version 3.6.23.1. (Ilia)

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 635445e92fc1f507004af57398485aa64c2c0d9f..d263f7893b6c85a071c63df063f123e6d999280c 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -100,6 +100,7 @@
 #endif
 
 PHPAPI extern char *php_ini_opened_path;
+PHPAPI extern char *php_ini_scanned_path;
 PHPAPI extern char *php_ini_scanned_files;
 
 #ifndef O_BINARY