Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 20:44:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'shtml-content-type' of github.com:birarda/hifi into near-grab-via-parenting

Browse source
This commit is contained in:
Seth Alves 2015-12-17 10:49:52 -08:00
commit 5d8417309a
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -145,9 +145,14 @@ bool HTTPManager::handleHTTPRequest(HTTPConnection* connection, const QUrl& url,
localFileData = localFileString.toLocal8Bit();
}
connection->respond(HTTPConnection::StatusCode200, localFileData,
qPrintable(mimeDatabase.mimeTypeForFile(filePath).name()));
// if this is an shtml file just make the MIME type match HTML so browsers aren't confused
auto mimeType = QString { "text/html" };
if (localFileInfo.suffix() != "shtml") {
mimeType = mimeDatabase.mimeTypeForFile(filePath).name();
}
connection->respond(HTTPConnection::StatusCode200, localFileData, qPrintable(mimeType));
return true;
}