Re: Patch for Bug #48831 php -i has different output to php --ini
[email protected] (Richard Quadling)
| Newsgroups | php.internals.win |
|---|---|
| Message-ID | <[email protected]> |
2009/8/24 Richard Quadling <[email protected]>: > Hi. > > Having got all the build tools now and I can actually test the code, > here is a patch for Bug#48831. > > Regards, > > Richard Quadling. > > > -- > ----- > Richard Quadling > "Standing on the shoulders of some very clever giants!" > EE : http://www.experts-exchange.com/M_248814.html > Zend Certified Engineer : http://zend.com/zce.php?c=ZEND002498&r=213474731 > ZOPA : http://uk.zopa.com/member/RQuadling > And here is the dropped (thanks Keisial) attachment. Hopefully. -- ----- Richard Quadling "Standing on the shoulders of some very clever giants!" EE : http://www.experts-exchange.com/M_248814.html Zend Certified Engineer : http://zend.com/zce.php?c=ZEND002498&r=213474731 ZOPA : http://uk.zopa.com/member/RQuadling
php-src_cli--ini.patch.txt
(text/plain, 3 KB)
Index: branches/PHP_5_2/sapi/cli/php_cli.c
===================================================================
--- branches/PHP_5_2/sapi/cli/php_cli.c (revision 287533)
+++ branches/PHP_5_2/sapi/cli/php_cli.c (working copy)
@@ -98,6 +98,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
@@ -1330,7 +1331,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;
}
Index: branches/PHP_5_3/sapi/cli/php_cli.c
===================================================================
--- branches/PHP_5_3/sapi/cli/php_cli.c (revision 287634)
+++ branches/PHP_5_3/sapi/cli/php_cli.c (working copy)
@@ -98,6 +98,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
@@ -1356,7 +1357,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;
}
Index: trunk/sapi/cli/php_cli.c
===================================================================
--- trunk/sapi/cli/php_cli.c (revision 287633)
+++ trunk/sapi/cli/php_cli.c (working copy)
@@ -98,6 +98,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
@@ -1361,7 +1362,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;
}