summaryrefslogtreecommitdiff
path: root/main/php_ini.c
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2002-04-16 19:08:02 +0000
committerMarcus Boerger <helly@php.net>2002-04-16 19:08:02 +0000
commit7bb4b5bd7607b36fef64aa5d889f7fd4f664f4e1 (patch)
tree9d903ff09839e18fe754f505fe3e96e595d56971 /main/php_ini.c
parent2e3ce44c805f98fe8ff8cce6916bff75e8958d0b (diff)
downloadphp-git-7bb4b5bd7607b36fef64aa5d889f7fd4f664f4e1.tar.gz
fix cli/cgi -c <path>|<file>
#hope this fixes it really (works for me)
Diffstat (limited to 'main/php_ini.c')
-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 7fd99c6536..8b449f7559 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -266,7 +266,12 @@ int php_init_config(char *php_ini_path_override)
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");
+ struct stat statbuf;
+ if (!VCWD_STAT(php_ini_path_override, &statbuf)) {
+ if (!S_ISDIR(statbuf.st_mode)) {
+ fh.handle.fp = VCWD_FOPEN(php_ini_path_override, "r");
+ }
+ }
}
/* Search php.ini file in search path */
if (!fh.handle.fp)