svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/sapi/cli/php_cli.c trunk/sapi/cli/php_cli.c
| From: | Pierre Joye | Date: | Tue, 14 Sep 2010 10:36:21 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/sapi/cli/php_cli.c trunk/sapi/cli/php_cli.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-63482@lists.php.net to get a copy of this message | ||
pajoye Tue, 14 Sep 2010 10:36:21 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=303357
Log:
- fix #48831 php -i has different output to php --ini
Bug: http://bugs.php.net/48831 (Assigned) php -i has
different output to php --ini
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c
U php/php-src/trunk/sapi/cli/php_cli.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2010-09-14 09:41:26 UTC (rev 303356)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-09-14 10:36:21 UTC (rev 303357)
@@ -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)
Modified: php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c 2010-09-14 09:41:26 UTC (rev 303356)
+++ php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c 2010-09-14 10:36:21 UTC (rev 303357)
@@ -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
Modified: php/php-src/trunk/sapi/cli/php_cli.c
===================================================================
--- php/php-src/trunk/sapi/cli/php_cli.c 2010-09-14 09:41:26 UTC (rev 303356)
+++ php/php-src/trunk/sapi/cli/php_cli.c 2010-09-14 10:36:21 UTC (rev 303357)
@@ -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
@@ -1424,7 +1425,7 @@
{
zend_printf("Configuration File (php.ini) Path: %s\n", PHP_CONFIG_FILE_PATH);
zend_printf("Loaded Configuration File: %s\n", php_ini_opened_path ?
php_ini_opened_path : "(none)");
- zend_printf("Scan for additional .ini files in: %s\n", *PHP_CONFIG_FILE_SCAN_DIR ?
PHP_CONFIG_FILE_SCAN_DIR : "(none)");
+ zend_printf("Scan for additional .ini files in: %s\n", php_ini_scanned_path ?
php_ini_scanned_path : "(none)");
zend_printf("Additional .ini files parsed: %s\n", php_ini_scanned_files ?
php_ini_scanned_files : "(none)");
break;
}