From 286b984d6fd0cb693b8465123ede179476c84893 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 17 Dec 2015 10:48:33 -0800 Subject: [PATCH] serve SHTML files with HTML MIME type --- libraries/embedded-webserver/src/HTTPManager.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libraries/embedded-webserver/src/HTTPManager.cpp b/libraries/embedded-webserver/src/HTTPManager.cpp index 1f1dfa1735..0b98d52cb1 100644 --- a/libraries/embedded-webserver/src/HTTPManager.cpp +++ b/libraries/embedded-webserver/src/HTTPManager.cpp @@ -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; }