Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 10:37:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1435 from daleglass/fix-html-mime-type

Browse source 
Fix mime type for serving .htm and .html files with the embedded webserver.
This commit is contained in:
Kalila 2021-11-04 19:11:05 -04:00 committed by GitHub
commit 457c622598
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/embedded-webserver/src/HTTPManager.cpp
View file

@ -166,9 +166,10 @@ bool HTTPManager::handleHTTPRequest(HTTPConnection* connection, const QUrl& url,
localFileData = localFileString.toLocal8Bit();
}
// if this is an shtml file just make the MIME type match HTML so browsers aren't confused
// if this is an shtml, html or htm file just make the MIME type match HTML so browsers aren't confused
// otherwise use the mimeDatabase to look it up
auto mimeType = localFileInfo.suffix() == "shtml"
auto suffix = localFileInfo.suffix();
auto mimeType = (suffix == "shtml" || suffix == "html" || suffix == "htm")
? QString { "text/html" }
: mimeDatabase.mimeTypeForFile(filePath).name();