]> granicus.if.org Git - php/commitdiff
fix cli/cgi -c <path>|<file>
authorMarcus Boerger <helly@php.net>
Tue, 16 Apr 2002 19:08:02 +0000 (19:08 +0000)
committerMarcus Boerger <helly@php.net>
Tue, 16 Apr 2002 19:08:02 +0000 (19:08 +0000)
#hope this fixes it really (works for me)

main/php_ini.c

index 7fd99c65364810a8a1194f239c9dc3fe63e71478..8b449f75599e515e47fded9e833137154816b17a 100644 (file)
@@ -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)