summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2010-09-14 10:36:21 +0000
committerPierre Joye <pajoye@php.net>2010-09-14 10:36:21 +0000
commit992991fe1b84b265fb000c76c84bb1809c4db133 (patch)
tree3d632f6c7447eb30e2998ffbed5c03b548d13e39
parent1f06a6a4e854cd73539db015c4bf9cfb123b7446 (diff)
downloadphp-git-992991fe1b84b265fb000c76c84bb1809c4db133.tar.gz
- fix #48831 php -i has different output to php --ini
-rw-r--r--NEWS2
-rw-r--r--sapi/cli/php_cli.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 7923f29648..28fa9a9e5d 100644
--- 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 635445e92f..d263f7893b 100644
--- 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