Currently, we can only specify path to "php.ini".
This patch allows to specify file for a config file
when SAPI is CLI.
Any comments?
--
Yasuo Ohgaki
Index: main/php_ini.c
===================================================================
RCS file: /repository/php4/main/php_ini.c,v
retrieving revision 1.80
diff -u -r1.80 php_ini.c
--- main/php_ini.c 5 Mar 2002 00:21:28 -0000 1.80
+++ main/php_ini.c 11 Apr 2002 04:21:30 -0000
@@ -262,8 +262,14 @@
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);
+
+ /* Check if php_ini_path_override is file first when SAPI is CLI. */
+ fh.handle.fp = NULL;
+ if (strcmp(sapi_module.name, "cli")==0) {
+ fh.handle.fp = VCWD_FOPEN(php_ini_path_override, "r");
+ }
+ 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);
}
Index: sapi/cli/php_cli.c
===================================================================
RCS file: /repository/php4/sapi/cli/php_cli.c,v
retrieving revision 1.18
diff -u -r1.18 php_cli.c
--- sapi/cli/php_cli.c 27 Mar 2002 22:49:21 -0000 1.18
+++ sapi/cli/php_cli.c 11 Apr 2002 04:21:30 -0000
@@ -248,7 +248,7 @@
" -w Display source with stripped
comments and whitespace.\n"
" -f <file> Parse <file>.\n"
" -v Version number\n"
- " -c <path> Look for php.ini file in this
directory\n"
+ " -c <path>|<file> Look for php.ini file in this
+directory\n"
" -a Run interactively\n"
" -d foo[=bar] Define INI entry foo with value
'bar'\n"
" -e Generate extended information for
debugger/profiler\n"
--
PHP Development Mailing List <http://www.php.net/>
To unsubscribe, visit: http://www.php.net/unsub.php
