From: Edin Kadribasic <edink@php.net>
Date: Mon, 29 Jul 2002 12:17:34 +0000 (+0000)
Subject: First try to open php-SAPI.ini and if it fails fall back to regular
X-Git-Tag: dev~113
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f94a8a7449cf0273fdbd0d00975325f870d6cd2;p=php

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.
---

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) {