Merge remote-tracking branch 'origin/fara' into roman

This commit is contained in:
3lswear
2022-02-27 18:15:43 +03:00
108 changed files with 3782 additions and 11 deletions

View File

@@ -419,8 +419,8 @@ bool ServerConfig::checkFileAndDir(location *loc)
if (!root.empty())
{
if (isDir(root) != 0)
throw ConfigException("Directory " + root + " not found!");
if (isDir(root) != 0 && isFile(root) != 0)
throw ConfigException("File or directory " + root + " not found!");
}
if (!upload_dir.empty())
{