summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main/php_ini.c7
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) {