diff options
Diffstat (limited to 'main/php_ini.c')
| -rw-r--r-- | main/php_ini.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index ba24ea260b..d440d5abde 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -262,8 +262,15 @@ int php_init_config(char *php_ini_path_override) PG(safe_mode) = 0; PG(open_basedir) = NULL; - - fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC); + + fh.handle.fp = NULL; + /* Check if php_ini_path_override is a file */ + if (php_ini_path_override && !php_ini_path_override[0]) { + fh.handle.fp = VCWD_FOPEN(php_ini_path_override, "r"); + } + /* Search php.ini file in search path */ + if (!fh.handle.fp) + fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC); if (free_ini_search_path) { efree(php_ini_search_path); } |