@@ -324,6 +324,36 @@ 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) @@ -363,6 +393,15 @@ 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)) src/webpage.cpp 47c421ade333481ab2f14619db6810cbbb483b86 Benjamin C Meyer ben@meyerhome.net http://github.com/icefox/arora/commit/f83796a6a2e79ddd4a02de19c6f61502924a69ec f83796a6a2e79ddd4a02de19c6f61502924a69ec 2009-10-07T21:45:02-07:00 2009-10-07T21:34:33-07:00 Do some very basic content sniffing for sites that do not send a content type in the reply. Issue: 697 d6e82c9c7d855c48b0a9e33532e1ae960336f3fd Benjamin C Meyer ben@meyerhome.net