summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2003-02-03 12:25:28 +0000
committerfoobar <sniper@php.net>2003-02-03 12:25:28 +0000
commit173b9493e20b22e414cc48b05d720efb228731e7 (patch)
tree7a1ade80a17f12c5889dd261d662f9ceeb035a93 /main
parentdb0897161c64f8561b0524db655b7aac928f7bd6 (diff)
downloadphp-git-173b9493e20b22e414cc48b05d720efb228731e7.tar.gz
Fixed bug: #22011 (-n must ignore all ini files)
Diffstat (limited to 'main')
-rw-r--r--main/php_ini.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/php_ini.c b/main/php_ini.c
index 97038fbbcd..6380a1b831 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -428,7 +428,7 @@ int php_init_config()
/* If the config_file_scan_dir is set at compile-time, go and scan this directory and
* parse any .ini files found in this directory. */
- if (strlen(PHP_CONFIG_FILE_SCAN_DIR)) {
+ if (!sapi_module.php_ini_ignore && strlen(PHP_CONFIG_FILE_SCAN_DIR)) {
struct dirent **namelist;
int ndir, i;