diff options
| author | Edin Kadribasic <edink@php.net> | 2002-07-29 12:17:34 +0000 |
|---|---|---|
| committer | Edin Kadribasic <edink@php.net> | 2002-07-29 12:17:34 +0000 |
| commit | 8f94a8a7449cf0273fdbd0d00975325f870d6cd2 (patch) | |
| tree | 33d69d4c7da1819fb8b603e5c67280ef93aa48b9 /main/php_ini.c | |
| parent | 200058ae81742d2f75d321a922511b5be57f7818 (diff) | |
| download | php-git-8f94a8a7449cf0273fdbd0d00975325f870d6cd2.tar.gz | |
First try to open php-SAPI.ini and if it fails fall back to regular
php.ini file. For example cli version of PHP will first try to open
php-cli.ini in the usual ini file search path and only if it fails
will it try to open php.ini using the same path.
Diffstat (limited to 'main/php_ini.c')
| -rw-r--r-- | main/php_ini.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index 913d338729..67e1defb85 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -312,7 +312,12 @@ int php_init_config() } /* 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); + char *ini_fname=emalloc(10+strlen(sapi_module.name)); + sprintf(ini_fname, "php-%s.ini", sapi_module.name); + if (!(fh.handle.fp = php_fopen_with_path(ini_fname, "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC))) { + fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC); + } + efree(ini_fname); fh.filename = php_ini_opened_path; } if (free_ini_search_path) { |