From: foobar <sniper@php.net>
Date: Mon, 3 Feb 2003 12:25:47 +0000 (+0000)
Subject: MFH: Fixed bug: #22011 (-n must ignore all ini files)
X-Git-Tag: php-4.3.2RC1~348
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=34c712bae0db49b6ff2ba5e2e90889a1ccac31cd;p=php

MFH: Fixed bug: #22011 (-n must ignore all ini files)
---

diff --git a/main/php_ini.c b/main/php_ini.c
index 747ef5f05f..8b1b7d1c1b 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -400,7 +400,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;