archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

cli: Fix swapped output in php --ini (#18557)

Browse source 
In #18527, I accidentally swapped the values. This is before my modification:

```
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_ini_scanned_path  ? php_ini_scanned_path : "(none)");
```

- "Loaded Configuration File" should be `php_ini_opened_path`
- "Scan for additional .ini files in" shoudl be `php_ini_scanned_path`
This commit is contained in:
Richard Schneeman 2025-05-14 14:36:20 -05:00 • committed by GitHub
parent 1de16c7f15
commit 89dc8d79a7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sapi/cli/php_cli.c
View file

@ -1107,13 +1107,13 @@ do_repeat:
case PHP_CLI_MODE_SHOW_INI_CONFIG:
{
zend_printf("Configuration File (php.ini) Path: \"%s\"\n", PHP_CONFIG_FILE_PATH);
if (php_ini_scanned_path) {
zend_printf("Loaded Configuration File: \"%s\"\n", php_ini_scanned_path);
if (php_ini_opened_path) {
zend_printf("Loaded Configuration File: \"%s\"\n", php_ini_opened_path);
} else {
zend_printf("Loaded Configuration File: (none)\n");
}
if (php_ini_opened_path) {
zend_printf("Scan for additional .ini files in: \"%s\"\n", php_ini_opened_path);
if (php_ini_scanned_path) {
zend_printf("Scan for additional .ini files in: \"%s\"\n", php_ini_scanned_path);
} else {
zend_printf("Scan for additional .ini files in: (none)\n");
}