cvs: php4 /main php_ini.c

helly Tue Apr 16 15:08:03 2002 EDT Modified files: /php4/main php_ini.c Log: fix cli/cgi -c <path>|<file> #hope this fixes it really (works for me) Index: php4/main/php_ini.c diff -u php4/main/php_ini.c:1.82 php4/main/php_ini.c:1.83 --- php4/main/php_ini.c:1.82 Sat Apr 13 10:12:17 2002 +++ php4/main/php_ini.c Tue Apr 16 15:08:02 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ini.c,v 1.82 2002/04/13 14:12:17 yohgaki Exp $ */ +/* $Id: php_ini.c,v 1.83 2002/04/16 19:08:02 helly Exp $ */ #include "php.h" #ifndef PHP_WIN32 @@ -266,7 +266,12 @@ 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)