Merge branch 'master' into 'release/1.3.2'

Master

See merge request kasm-technologies/internal/KasmVNC!142
release/1.3.2
Matthew McClaskey 8 months ago
commit 0e043bc4a0

@ -783,6 +783,10 @@ static const char *name2mime(const char *name) {
goto def; goto def;
end++; 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)) #define CMP(s) if (!strncmp(end, s, sizeof(s) - 1))
CMP("htm") CMP("htm")

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

Loading…
Cancel
Save