Fixed parsing of html header in the qtextcodec.

The QTextCodec::codecForHtml used to expect http-equiv attribute before
the charset attribute in the meta header, which is not always the case.

Reviewed-by: Simon Hausmann

1 files changed, 8 insertions, 6 deletions

diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
index 3ef9f7e5e9..4f0e13c5fe 100644
--- a/src/corelib/codecs/qtextcodec.cpp
+++ b/src/corelib/codecs/qtextcodec.cpp
@@ -1536,12 +1536,14 @@ QTextCodec *QTextCodec::codecForHtml(const QByteArray &ba, QTextCodec *defaultCo
     if (!c) {
         QByteArray header = ba.left(512).toLower();
         if ((pos = header.indexOf("http-equiv=")) != -1) {
-            pos = header.indexOf("charset=", pos) + int(strlen("charset="));
-            if (pos != -1) {
-                int pos2 = header.indexOf('\"', pos+1);
-                QByteArray cs = header.mid(pos, pos2-pos);
-                //            qDebug("found charset: %s", cs.data());
-                c = QTextCodec::codecForName(cs);
+            if ((pos = header.lastIndexOf("meta ", pos)) != -1) {
+                pos = header.indexOf("charset=", pos) + int(strlen("charset="));
+                if (pos != -1) {
+                    int pos2 = header.indexOf('\"', pos+1);
+                    QByteArray cs = header.mid(pos, pos2-pos);
+                    //            qDebug("found charset: %s", cs.data());
+                    c = QTextCodec::codecForName(cs);
+                }
             }
         }
     }