Revert f83796a as it was obsoleted by qtwebkit/qtwebkit@37a183b

src/webpage.cpp

@@ -328,36 +328,6 @@ QObject *WebPage::createPlugin(const QString &classId, const QUrl &url,
 #endif
 }
 
-// The chromium guys have documented many examples of incompatibilities that
-// different browsers have when they mime sniff.
-// http://src.chromium.org/viewvc/chrome/trunk/src/net/base/mime_sniffer.cc
-//
-// All WebKit ports should share a common set of rules to sniff content.
-// By having this here we are yet another browser that has different behavior :(
-// But sadly QtWebKit does no sniffing at all so we are forced to do something.
-static bool contentSniff(const QByteArray &data)
-{
-    if (data.contains("<!doctype")
-        || data.contains("<script")
-        || data.contains("<html")
-        || data.contains("<!--")
-        || data.contains("<head")
-        || data.contains("<iframe")
-        || data.contains("<h1")
-        || data.contains("<div")
-        || data.contains("<font")
-        || data.contains("<table")
-        || data.contains("<a")
-        || data.contains("<style")
-        || data.contains("<title")
-        || data.contains("<b")
-        || data.contains("<body")
-        || data.contains("<br")
-        || data.contains("<p"))
-        return true;
-    return false;
-}
-
 void WebPage::handleUnsupportedContent(QNetworkReply *reply)
 {
     if (!reply)
@@ -397,15 +367,6 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply)
     if (!notFoundFrame)
         return;
 
-    if (reply->header(QNetworkRequest::ContentTypeHeader).toString().isEmpty()) {
-        // do evil
-        QByteArray data = reply->readAll();
-        if (contentSniff(data)) {
-            notFoundFrame->setHtml(QLatin1String(data), replyUrl);
-            return;
-        }
-    }
-
     // Generate translated not found error page with an image
     QFile notFoundErrorFile(QLatin1String(":/notfound.html"));
     if (!notFoundErrorFile.open(QIODevice::ReadOnly))