Merge branch 'master' into 'release/1.3.2'

Master

See merge request kasm-technologies/internal/KasmVNC!142
This commit is contained in:
Matthew McClaskey
2024-08-27 09:51:45 +00:00
2 changed files with 6 additions and 0 deletions

View File

@@ -783,6 +783,10 @@ static const char *name2mime(const char *name) {
goto def;
end++;
// Everything under Downloads/ should be treated as binary
if (strcasestr(name, "Downloads/"))
goto def;
#define CMP(s) if (!strncmp(end, s, sizeof(s) - 1))
CMP("htm")

View File

@@ -520,6 +520,8 @@ int main(int argc, char **argv) {
cursorhash = newhash;
}
XFree(cursor);
usleep(sleeptime);
}