diff options
author | Jérôme Loyet <fat@php.net> | 2010-11-11 17:24:27 +0000 |
---|---|---|
committer | Jérôme Loyet <fat@php.net> | 2010-11-11 17:24:27 +0000 |
commit | e1b87cce1f9ca39dc9191f5335da2d49db0db083 (patch) | |
tree | cd8cdda20f7f7597685384acc7831b4100804953 /sapi/cli/php_cli.c | |
parent | b896c87bb52282243251bde25b2523a9e4a8bc34 (diff) | |
download | php-git-e1b87cce1f9ca39dc9191f5335da2d49db0db083.tar.gz |
- Fixed #52045 (FPM tries to open php.ini from the current dir)
- Add php_ini_ignore_cwd to _sapi_module_struct
Diffstat (limited to 'sapi/cli/php_cli.c')
-rw-r--r-- | sapi/cli/php_cli.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 8936b2aebe..f784cc8c64 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -734,6 +734,7 @@ int main(int argc, char *argv[]) cli_sapi_module.ini_defaults = sapi_cli_ini_defaults; cli_sapi_module.php_ini_path_override = NULL; cli_sapi_module.phpinfo_as_text = 1; + cli_sapi_module.php_ini_ignore_cwd = 1; sapi_startup(&cli_sapi_module); #ifdef PHP_WIN32 |