Bug 599320 - Refuse encodings that are not rough ASCII supersets as hints from parent, previous doc or cache. r=smaug.

2012-10-16 10:42:54 +03:00
parent ada1c47462
commit c35d93319b
9 changed files with 1210 additions and 66 deletions
--- a/parser/html/nsHtml5StreamParser.cpp
+++ b/parser/html/nsHtml5StreamParser.cpp
@@ -1213,10 +1213,7 @@ nsHtml5StreamParser::PreferredForInternalEncodingDecl(nsACString& aEncoding)
      preferred.LowerCaseEqualsLiteral("utf-16be") ||
      preferred.LowerCaseEqualsLiteral("utf-16le") ||
      preferred.LowerCaseEqualsLiteral("utf-7") ||
-      preferred.LowerCaseEqualsLiteral("jis_x0212-1990") ||
-      preferred.LowerCaseEqualsLiteral("x-jis0208") ||
-      preferred.LowerCaseEqualsLiteral("x-imap4-modified-utf7") ||
-      preferred.LowerCaseEqualsLiteral("x-user-defined")) {
+      preferred.LowerCaseEqualsLiteral("x-imap4-modified-utf7")) {
    // Not a rough ASCII superset
    mTreeBuilder->MaybeComplainAboutCharset("EncMetaNonRoughSuperset",
                                            true,