Merge mozilla-central to mozilla-inbound

2016-07-14 11:56:37 +02:00
parent 32109b7d84 4e51d792ef
commit 7c5a27768f
200 changed files with 1952 additions and 1915 deletions
--- a/dom/html/HTMLFormSubmission.cpp
+++ b/dom/html/HTMLFormSubmission.cpp
@@ -875,7 +875,7 @@ GetSubmitCharset(nsGenericHTMLElement* aForm,
        nsAutoString uCharset;
        acceptCharsetValue.Mid(uCharset, offset, cnt);

-        if (EncodingUtils::FindEncodingForLabel(uCharset, oCharset))
+        if (EncodingUtils::FindEncodingForLabelNoReplacement(uCharset, oCharset))
          return;
      }
      offset = spPos + 1;