summaryrefslogtreecommitdiff
path: root/main/php_ini.c
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2003-02-03 12:25:47 +0000
committerfoobar <sniper@php.net>2003-02-03 12:25:47 +0000
commit34c712bae0db49b6ff2ba5e2e90889a1ccac31cd (patch)
tree5c04f3cb9f4b0bbeca56fb3fb14f8da9a878c3b0 /main/php_ini.c
parent93ca6a350e0e6c3ad8d98f1957755cfc9769615a (diff)
downloadphp-git-34c712bae0db49b6ff2ba5e2e90889a1ccac31cd.tar.gz
MFH: Fixed bug: #22011 (-n must ignore all ini files)
Diffstat (limited to 'main/php_ini.c')
-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 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;