Skip to content

sapi/cli/php_cli.c: later -n and -c should supersede earlier ones #25261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
orlitzky wants to merge 1 commit into
base: master
Choose a base branch
from
Open

sapi/cli/php_cli.c: later -n and -c should supersede earlier ones #25261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/standard/tests/ini_info/php_ini_loaded_file.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ php_ini_loaded_file() function
$code = '"var_dump(php_ini_loaded_file());"';

// No ini file ($args mays contains some)
passthru("$php -n -r $code");
passthru("$php $args -n -r $code");

// Specified ini file
passthru("$php $args -c $inifile -r $code");
Expand Down
7 changes: 7 additions & 0 deletions sapi/cli/php_cli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1266,12 +1266,19 @@ PHP_CLI_API int do_php_cli(int argc, char *argv[])
while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 1, 2))!=-1) {
switch (c) {
case 'c':
/* later -c override earlier -n */
ini_ignore = 0;
if (ini_path_override) {
free(ini_path_override);
}
ini_path_override = strdup(php_optarg);
break;
case 'n':
/* later -n override earlier -c */
if (ini_path_override) {
free(ini_path_override);
}
ini_path_override = NULL;
ini_ignore = 1;
break;
case 'd':
Expand Down
Loading