Attachment 360303 Details for Bug 180526 – Patch

[patch] Patch

bug-180526-20190127210124.patch (text/plain), 23.57 KB, created by Rob Buis on 2019-01-27 12:01:26 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Buis

Created: 2019-01-27 12:01:26 PST

Size: 23.57 KB

patch

obsolete

>Subversion Revision: 240546
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index f81fccd97ebfae4cc84ab77266ed9b96c96a6622..591ae8499460fed88aba77cac48c0e180d0b64a9 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,42 @@
>+2019-01-26  Rob Buis  <rbuis@igalia.com>
>+
>+        Update MIME type parser
>+        https://bugs.webkit.org/show_bug.cgi?id=180526
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This fixes two problems with the MIME parser:
>+        - I overlooked step 9.3 [1], for Mimesniff we should not
>+          bail out on missing subtype, but keep trying. Note
>+          that Rfc2045 does require bailing out, as before.
>+
>+        - Make the fact that the content-type is valid a not part
>+          of the parser's state. This way validation and actual
>+          parsing (and in the future serialization) will not
>+          require one parsing pass each.
>+
>+        Test: ParsedContentType unit test
>+
>+        [1] https://mimesniff.spec.whatwg.org/#parse-a-mime-type
>+
>+        * Modules/encryptedmedia/CDM.cpp:
>+        (WebCore::CDM::getSupportedCapabilitiesForAudioVideoType):
>+        * platform/network/DataURLDecoder.cpp:
>+        (WebCore::DataURLDecoder::parseMediaType):
>+        (WebCore::DataURLDecoder::DecodeTask::process):
>+        * platform/network/ParsedContentType.cpp:
>+        (WebCore::ParsedContentType::parseContentType):
>+        (WebCore::ParsedContentType::ParsedContentType):
>+        (WebCore::DummyParsedContentType::setContentType const): Deleted.
>+        (WebCore::DummyParsedContentType::setContentTypeParameter const): Deleted.
>+        (WebCore::parseContentType): Deleted.
>+        (WebCore::isValidContentType): Deleted.
>+        * platform/network/ParsedContentType.h:
>+        (WebCore::ParsedContentType::isValid const):
>+        * xml/XMLHttpRequest.cpp:
>+        (WebCore::XMLHttpRequest::send):
>+        (WebCore::XMLHttpRequest::overrideMimeType):
>+
> 2019-01-26  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][BFC] Ignore last inflow child's collapsed through margin after when computing containing block's height.
>diff --git a/Source/WebCore/Modules/encryptedmedia/CDM.cpp b/Source/WebCore/Modules/encryptedmedia/CDM.cpp
>index ebf067f7b57f16c330b5d740438834222efabd8f..72445819d3eb38f2df9da57f38533e7ba98f9de0 100644
>--- a/Source/WebCore/Modules/encryptedmedia/CDM.cpp
>+++ b/Source/WebCore/Modules/encryptedmedia/CDM.cpp
>@@ -432,12 +432,12 @@ Optional<Vector<MediaKeySystemMediaCapability>> CDM::getSupportedCapabilitiesFor
>         if (requestedCapability.contentType.isEmpty())
>             return WTF::nullopt;
> 
>+        ParsedContentType contentType { requestedCapability.contentType, Mode::Rfc2045 };
>         // 3.4. If content type is an invalid or unrecognized MIME type, continue to the next iteration.
>-        if (!isValidContentType(requestedCapability.contentType, Mode::Rfc2045))
>+        if (!contentType.isValid())
>             continue;
> 
>         // 3.5. Let container be the container type specified by content type.
>-        ParsedContentType contentType { requestedCapability.contentType };
>         String container = contentType.mimeType();
> 
>         // 3.6. If the user agent does not support container, continue to the next iteration. The case-sensitivity
>diff --git a/Source/WebCore/platform/network/ParsedContentType.cpp b/Source/WebCore/platform/network/ParsedContentType.cpp
>index e3eabd99903c69b2149f09fa03d09b4b5bcc9f2e..66afb621b0d5180c6211e3e3d23eaaf949059c6f 100644
>--- a/Source/WebCore/platform/network/ParsedContentType.cpp
>+++ b/Source/WebCore/platform/network/ParsedContentType.cpp
>@@ -36,12 +36,6 @@
> 
> namespace WebCore {
> 
>-class DummyParsedContentType {
>-public:
>-    void setContentType(const SubstringRange&, Mode) const { }
>-    void setContentTypeParameter(const String&, const String&, Mode) const { }
>-};
>-
> static void skipSpaces(const String& input, unsigned& startIndex)
> {
>     while (startIndex < input.length() && input[startIndex] == ' ')
>@@ -189,64 +183,66 @@ static bool isNotSemicolonOrEqualSign(UChar ch)
>     return ch != ';' && ch != '=';
> }
> 
>-template <class ReceiverType>
>-bool parseContentType(const String& contentType, ReceiverType& receiver, Mode mode)
>+void ParsedContentType::parseContentType(const String& contentType, Mode mode)
> {
>+    if (contentType.contains('\r') || contentType.contains('\n'))
>+        return;
>     unsigned index = 0;
>     unsigned contentTypeLength = contentType.length();
>     skipSpaces(contentType, index);
>     if (index >= contentTypeLength)  {
>         LOG_ERROR("Invalid Content-Type string '%s'", contentType.ascii().data());
>-        return false;
>+        return;
>     }
> 
>     unsigned contentTypeStart = index;
>     auto typeRange = parseToken(contentType, index, isNotForwardSlash, mode);
>     if (!typeRange || containsNonTokenCharacters(contentType, *typeRange)) {
>         LOG_ERROR("Invalid Content-Type, invalid type value.");
>-        return false;
>+        return;
>     }
> 
>     if (contentType[index++] != '/') {
>         LOG_ERROR("Invalid Content-Type, missing '/'.");
>-        return false;
>+        return;
>     }
> 
>     auto subTypeRange = parseToken(contentType, index, isNotSemicolon, mode, mode == Mode::MimeSniff);
>     if (!subTypeRange || containsNonTokenCharacters(contentType, *subTypeRange)) {
>         LOG_ERROR("Invalid Content-Type, invalid subtype value.");
>-        return false;
>+        return;
>     }
> 
>     // There should not be any quoted strings until we reach the parameters.
>     size_t semiColonIndex = contentType.find(';', contentTypeStart);
>     if (semiColonIndex == notFound) {
>-        receiver.setContentType(SubstringRange(contentTypeStart, contentTypeLength - contentTypeStart), mode);
>-        return true;
>+        setContentType(SubstringRange(contentTypeStart, contentTypeLength - contentTypeStart), mode);
>+        m_isValid = true;
>+        return;
>     }
> 
>-    receiver.setContentType(SubstringRange(contentTypeStart, semiColonIndex - contentTypeStart), mode);
>+    setContentType(SubstringRange(contentTypeStart, semiColonIndex - contentTypeStart), mode);
>     index = semiColonIndex + 1;
>     while (true) {
>         skipSpaces(contentType, index);
>         auto keyRange = parseToken(contentType, index, isNotSemicolonOrEqualSign, mode);
>         if (mode == Mode::Rfc2045 && (!keyRange || index >= contentTypeLength)) {
>             LOG_ERROR("Invalid Content-Type parameter name.");
>-            return false;
>+            return;
>         }
> 
>         // Should we tolerate spaces here?
>         if (mode == Mode::Rfc2045) {
>             if (contentType[index++] != '=' || index >= contentTypeLength) {
>                 LOG_ERROR("Invalid Content-Type malformed parameter.");
>-                return false;
>+                return;
>             }
>         } else {
>             if (index >= contentTypeLength)
>                 break;
>             if (contentType[index] != '=' && contentType[index] != ';') {
>                 LOG_ERROR("Invalid Content-Type malformed parameter.");
>-                return false;
>+                return;
>             }
>             if (contentType[index++] == ';')
>                 continue;
>@@ -264,39 +260,34 @@ bool parseContentType(const String& contentType, ReceiverType& receiver, Mode mo
>             valueRange = parseToken(contentType, index, isNotSemicolon, mode, mode == Mode::MimeSniff);
> 
>         if (!valueRange) {
>+            if (mode == Mode::MimeSniff)
>+                continue;
>             LOG_ERROR("Invalid Content-Type, invalid parameter value.");
>-            return false;
>+            return;
>         }
> 
>         String parameterValue = substringForRange(contentType, *valueRange);
>         // Should we tolerate spaces here?
>         if (mode == Mode::Rfc2045 && index < contentTypeLength && contentType[index++] != ';') {
>             LOG_ERROR("Invalid Content-Type, invalid character at the end of key/value parameter.");
>-            return false;
>+            return;
>         }
> 
>-        receiver.setContentTypeParameter(parameterName, parameterValue, mode);
>+        setContentTypeParameter(parameterName, parameterValue, mode);
> 
>-        if (index >= contentTypeLength)
>-            return true;
>+        if (index >= contentTypeLength) {
>+            m_isValid = true;
>+            return;
>+        }
>     }
> 
>-    return true;
>-}
>-
>-bool isValidContentType(const String& contentType, Mode mode)
>-{
>-    if (contentType.contains('\r') || contentType.contains('\n'))
>-        return false;
>-
>-    DummyParsedContentType parsedContentType = DummyParsedContentType();
>-    return parseContentType<DummyParsedContentType>(contentType, parsedContentType, mode);
>+    m_isValid = true;
> }
> 
> ParsedContentType::ParsedContentType(const String& contentType, Mode mode)
>     : m_contentType(contentType.stripWhiteSpace())
> {
>-    parseContentType<ParsedContentType>(m_contentType, *this, mode);
>+    parseContentType(m_contentType, mode);
> }
> 
> String ParsedContentType::charset() const
>@@ -341,4 +332,9 @@ void ParsedContentType::setContentTypeParameter(const String& keyName, const Str
>     m_parameters.set(keyName, keyValue);
> }
> 
>+bool ParsedContentType::isValid() const
>+{
>+    return m_isValid;
>+}
>+
> }
>diff --git a/Source/WebCore/platform/network/ParsedContentType.h b/Source/WebCore/platform/network/ParsedContentType.h
>index 949010b7270c7c7045fc2ab0ba5c35496dc0dd79..423fdc38e06e3d599c1c5dd10ef73d1dee73ee21 100644
>--- a/Source/WebCore/platform/network/ParsedContentType.h
>+++ b/Source/WebCore/platform/network/ParsedContentType.h
>@@ -42,12 +42,11 @@ enum class Mode {
> };
> // <index, length>
> typedef std::pair<unsigned, unsigned> SubstringRange;
>-WEBCORE_EXPORT bool isValidContentType(const String&, Mode = Mode::MimeSniff);
> 
> // FIXME: add support for comments.
> class ParsedContentType {
> public:
>-    explicit ParsedContentType(const String&, Mode = Mode::MimeSniff);
>+    WEBCORE_EXPORT explicit ParsedContentType(const String&, Mode = Mode::MimeSniff);
> 
>     String mimeType() const { return m_mimeType; }
>     String charset() const;
>@@ -56,9 +55,10 @@ public:
>     String parameterValueForName(const String&) const;
>     size_t parameterCount() const;
> 
>+    WEBCORE_EXPORT bool isValid() const;
>+
> private:
>-    template<class ReceiverType>
>-    friend bool parseContentType(const String&, ReceiverType&, Mode);
>+    void parseContentType(const String&, Mode);
>     void setContentType(const SubstringRange&, Mode);
>     void setContentTypeParameter(const String&, const String&, Mode);
> 
>@@ -66,6 +66,7 @@ private:
>     String m_contentType;
>     KeyValuePairs m_parameters;
>     String m_mimeType;
>+    bool m_isValid { false };
> };
> 
> }
>diff --git a/Source/WebCore/xml/XMLHttpRequest.cpp b/Source/WebCore/xml/XMLHttpRequest.cpp
>index 5116457da85ff17341431f6da5f88ec6773955e4..ce8e463d9f1113d5e345c9a2818204165861b8cd 100644
>--- a/Source/WebCore/xml/XMLHttpRequest.cpp
>+++ b/Source/WebCore/xml/XMLHttpRequest.cpp
>@@ -525,7 +525,7 @@ ExceptionOr<void> XMLHttpRequest::send(Blob& body)
>     if (m_method != "GET" && m_method != "HEAD" && m_url.protocolIsInHTTPFamily()) {
>         if (!m_requestHeaders.contains(HTTPHeaderName::ContentType)) {
>             const String& blobType = body.type();
>-            if (!blobType.isEmpty() && isValidContentType(blobType))
>+            if (!blobType.isEmpty() && ParsedContentType(blobType).isValid())
>                 m_requestHeaders.set(HTTPHeaderName::ContentType, blobType);
>             else {
>                 // From FileAPI spec, whenever media type cannot be determined, empty string must be returned.
>@@ -785,7 +785,7 @@ ExceptionOr<void> XMLHttpRequest::overrideMimeType(const String& mimeType)
>         return Exception { InvalidStateError };
> 
>     m_mimeTypeOverride = "application/octet-stream"_s;
>-    if (isValidContentType(mimeType))
>+    if (ParsedContentType(mimeType).isValid())
>         m_mimeTypeOverride = mimeType;
> 
>     return { };
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index eba8e91d9944037712c4062435c6205c076119ca..553f2e4eeaef980a445aac58d5aaa85e50334985 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-01-26  Rob Buis  <rbuis@igalia.com>
>+
>+        Update MIME type parser
>+        https://bugs.webkit.org/show_bug.cgi?id=180526
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Adapt to API change and spec fix.
>+
>+        * TestWebKitAPI/Tests/WebCore/ParsedContentType.cpp:
>+        (TestWebKitAPI::TEST):
>+
> 2019-01-26  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][BFC] Ignore last inflow child's collapsed through margin after when computing containing block's height.
>diff --git a/Tools/TestWebKitAPI/Tests/WebCore/ParsedContentType.cpp b/Tools/TestWebKitAPI/Tests/WebCore/ParsedContentType.cpp
>index 45b88946af76a26dca5959d311da45ad4678cec6..b827c0d4c9b2d9bdc8c2ef95ae492a0aa571aaf3 100644
>--- a/Tools/TestWebKitAPI/Tests/WebCore/ParsedContentType.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebCore/ParsedContentType.cpp
>@@ -34,66 +34,68 @@ namespace TestWebKitAPI {
> 
> TEST(ParsedContentType, MimeSniff)
> {
>-    EXPECT_TRUE(isValidContentType("text/plain", Mode::MimeSniff));
>-    EXPECT_TRUE(isValidContentType(" text/plain", Mode::MimeSniff));
>-    EXPECT_TRUE(isValidContentType(" text/plain ", Mode::MimeSniff));
>-    EXPECT_FALSE(isValidContentType("text /plain", Mode::MimeSniff));
>-    EXPECT_FALSE(isValidContentType("text/ plain", Mode::MimeSniff));
>-    EXPECT_FALSE(isValidContentType("text / plain", Mode::MimeSniff));
>-    EXPECT_FALSE(isValidContentType("te xt/plain", Mode::MimeSniff));
>-    EXPECT_FALSE(isValidContentType("text/pla in", Mode::MimeSniff));
>+    EXPECT_TRUE(ParsedContentType("text/plain", Mode::MimeSniff).isValid());
>+    EXPECT_TRUE(ParsedContentType(" text/plain", Mode::MimeSniff).isValid());
>+    EXPECT_TRUE(ParsedContentType(" text/plain ", Mode::MimeSniff).isValid());
>+    EXPECT_FALSE(ParsedContentType("text /plain", Mode::MimeSniff).isValid());
>+    EXPECT_FALSE(ParsedContentType("text/ plain", Mode::MimeSniff).isValid());
>+    EXPECT_FALSE(ParsedContentType("text / plain", Mode::MimeSniff).isValid());
>+    EXPECT_FALSE(ParsedContentType("te xt/plain", Mode::MimeSniff).isValid());
>+    EXPECT_FALSE(ParsedContentType("text/pla in", Mode::MimeSniff).isValid());
> 
>-    EXPECT_FALSE(isValidContentType("text", Mode::MimeSniff));
>-    EXPECT_FALSE(isValidContentType("text/", Mode::MimeSniff));
>-    EXPECT_FALSE(isValidContentType("/plain", Mode::MimeSniff));
>+    EXPECT_FALSE(ParsedContentType("text", Mode::MimeSniff).isValid());
>+    EXPECT_FALSE(ParsedContentType("text/", Mode::MimeSniff).isValid());
>+    EXPECT_FALSE(ParsedContentType("/plain", Mode::MimeSniff).isValid());
> 
>-    EXPECT_TRUE(isValidContentType("text/plain;", Mode::MimeSniff));
>+    EXPECT_TRUE(ParsedContentType("text/plain;", Mode::MimeSniff).isValid());
> 
>-    EXPECT_TRUE(isValidContentType("text/plain;test", Mode::MimeSniff));
>-    EXPECT_TRUE(isValidContentType("text/plain; test", Mode::MimeSniff));
>-    EXPECT_FALSE(isValidContentType("text/plain;test=", Mode::MimeSniff));
>-    EXPECT_TRUE(isValidContentType("text/plain;test=value", Mode::MimeSniff));
>-    EXPECT_TRUE(isValidContentType("text/plain; test=value", Mode::MimeSniff));
>-    EXPECT_TRUE(isValidContentType("text/plain;test =value", Mode::MimeSniff));
>-    EXPECT_TRUE(isValidContentType("text/plain;test= value", Mode::MimeSniff));
>-    EXPECT_TRUE(isValidContentType("text/plain;test=value ", Mode::MimeSniff));
>+    EXPECT_TRUE(ParsedContentType("text/plain;test", Mode::MimeSniff).isValid());
>+    EXPECT_TRUE(ParsedContentType("text/plain; test", Mode::MimeSniff).isValid());
>+    EXPECT_TRUE(ParsedContentType("text/plain;test=", Mode::MimeSniff).isValid());
>+    EXPECT_TRUE(ParsedContentType("text/plain;test=;test=value", Mode::MimeSniff).isValid());
>+    EXPECT_TRUE(ParsedContentType("text/plain;test=value", Mode::MimeSniff).isValid());
>+    EXPECT_TRUE(ParsedContentType("text/plain; test=value", Mode::MimeSniff).isValid());
>+    EXPECT_TRUE(ParsedContentType("text/plain;test =value", Mode::MimeSniff).isValid());
>+    EXPECT_TRUE(ParsedContentType("text/plain;test= value", Mode::MimeSniff).isValid());
>+    EXPECT_TRUE(ParsedContentType("text/plain;test=value ", Mode::MimeSniff).isValid());
> 
>-    EXPECT_TRUE(isValidContentType("text/plain;test=\"value\"", Mode::MimeSniff));
>-    EXPECT_TRUE(isValidContentType("text/plain;test=\"value", Mode::MimeSniff));
>-    EXPECT_TRUE(isValidContentType("text/plain;test=\"value\"foo", Mode::MimeSniff));
>-    EXPECT_TRUE(isValidContentType("text/plain;test=\"value\"foo;foo=bar", Mode::MimeSniff));
>+    EXPECT_TRUE(ParsedContentType("text/plain;test=\"value\"", Mode::MimeSniff).isValid());
>+    EXPECT_TRUE(ParsedContentType("text/plain;test=\"value", Mode::MimeSniff).isValid());
>+    EXPECT_TRUE(ParsedContentType("text/plain;test=\"value\"foo", Mode::MimeSniff).isValid());
>+    EXPECT_TRUE(ParsedContentType("text/plain;test=\"value\"foo;foo=bar", Mode::MimeSniff).isValid());
> }
> 
> TEST(ParsedContentType, Rfc2045)
> {
>-    EXPECT_TRUE(isValidContentType("text/plain", Mode::Rfc2045));
>-    EXPECT_TRUE(isValidContentType(" text/plain", Mode::Rfc2045));
>-    EXPECT_TRUE(isValidContentType(" text/plain ", Mode::Rfc2045));
>-    EXPECT_FALSE(isValidContentType("text /plain", Mode::Rfc2045));
>-    EXPECT_FALSE(isValidContentType("text/ plain", Mode::Rfc2045));
>-    EXPECT_FALSE(isValidContentType("text / plain", Mode::Rfc2045));
>-    EXPECT_FALSE(isValidContentType("te xt/plain", Mode::Rfc2045));
>-    EXPECT_TRUE(isValidContentType("text/pla in", Mode::Rfc2045));
>+    EXPECT_TRUE(ParsedContentType("text/plain", Mode::Rfc2045).isValid());
>+    EXPECT_TRUE(ParsedContentType(" text/plain", Mode::Rfc2045).isValid());
>+    EXPECT_TRUE(ParsedContentType(" text/plain ", Mode::Rfc2045).isValid());
>+    EXPECT_FALSE(ParsedContentType("text /plain", Mode::Rfc2045).isValid());
>+    EXPECT_FALSE(ParsedContentType("text/ plain", Mode::Rfc2045).isValid());
>+    EXPECT_FALSE(ParsedContentType("text / plain", Mode::Rfc2045).isValid());
>+    EXPECT_FALSE(ParsedContentType("te xt/plain", Mode::Rfc2045).isValid());
>+    EXPECT_TRUE(ParsedContentType("text/pla in", Mode::Rfc2045).isValid());
> 
>-    EXPECT_FALSE(isValidContentType("text", Mode::Rfc2045));
>-    EXPECT_FALSE(isValidContentType("text/", Mode::Rfc2045));
>-    EXPECT_FALSE(isValidContentType("/plain", Mode::Rfc2045));
>+    EXPECT_FALSE(ParsedContentType("text", Mode::Rfc2045).isValid());
>+    EXPECT_FALSE(ParsedContentType("text/", Mode::Rfc2045).isValid());
>+    EXPECT_FALSE(ParsedContentType("/plain", Mode::Rfc2045).isValid());
> 
>-    EXPECT_FALSE(isValidContentType("text/plain;", Mode::Rfc2045));
>+    EXPECT_FALSE(ParsedContentType("text/plain;", Mode::Rfc2045).isValid());
> 
>-    EXPECT_FALSE(isValidContentType("text/plain;test", Mode::Rfc2045));
>-    EXPECT_FALSE(isValidContentType("text/plain; test", Mode::Rfc2045));
>-    EXPECT_FALSE(isValidContentType("text/plain;test=", Mode::Rfc2045));
>-    EXPECT_TRUE(isValidContentType("text/plain;test=value", Mode::Rfc2045));
>-    EXPECT_TRUE(isValidContentType("text/plain; test=value", Mode::Rfc2045));
>-    EXPECT_FALSE(isValidContentType("text/plain;test =value", Mode::Rfc2045));
>-    EXPECT_FALSE(isValidContentType("text/plain;test= value", Mode::Rfc2045));
>-    EXPECT_FALSE(isValidContentType("text/plain;test=value ", Mode::Rfc2045));
>+    EXPECT_FALSE(ParsedContentType("text/plain;test", Mode::Rfc2045).isValid());
>+    EXPECT_FALSE(ParsedContentType("text/plain; test", Mode::Rfc2045).isValid());
>+    EXPECT_FALSE(ParsedContentType("text/plain;test=", Mode::Rfc2045).isValid());
>+    EXPECT_FALSE(ParsedContentType("text/plain;test=;test=value", Mode::Rfc2045).isValid());
>+    EXPECT_TRUE(ParsedContentType("text/plain;test=value", Mode::Rfc2045).isValid());
>+    EXPECT_TRUE(ParsedContentType("text/plain; test=value", Mode::Rfc2045).isValid());
>+    EXPECT_FALSE(ParsedContentType("text/plain;test =value", Mode::Rfc2045).isValid());
>+    EXPECT_FALSE(ParsedContentType("text/plain;test= value", Mode::Rfc2045).isValid());
>+    EXPECT_FALSE(ParsedContentType("text/plain;test=value ", Mode::Rfc2045).isValid());
> 
>-    EXPECT_TRUE(isValidContentType("text/plain;test=\"value\"", Mode::Rfc2045));
>-    EXPECT_FALSE(isValidContentType("text/plain;test=\"value", Mode::Rfc2045));
>-    EXPECT_FALSE(isValidContentType("text/plain;test=\"value\"foo", Mode::Rfc2045));
>-    EXPECT_FALSE(isValidContentType("text/plain;test=\"value\"foo;foo=bar", Mode::Rfc2045));
>+    EXPECT_TRUE(ParsedContentType("text/plain;test=\"value\"", Mode::Rfc2045).isValid());
>+    EXPECT_FALSE(ParsedContentType("text/plain;test=\"value", Mode::Rfc2045).isValid());
>+    EXPECT_FALSE(ParsedContentType("text/plain;test=\"value\"foo", Mode::Rfc2045).isValid());
>+    EXPECT_FALSE(ParsedContentType("text/plain;test=\"value\"foo;foo=bar", Mode::Rfc2045).isValid());
> }
> 
> } // namespace TestWebKitAPI
>diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
>index ec057412ce368bd74036ff1436c6a5caf449c7af..0c81c6df80ef7af278ace92e9e510a247d9ebbfb 100644
>--- a/LayoutTests/imported/w3c/ChangeLog
>+++ b/LayoutTests/imported/w3c/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-01-26  Rob Buis  <rbuis@igalia.com>
>+
>+        Update MIME type parser
>+        https://bugs.webkit.org/show_bug.cgi?id=180526
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Update improved test expectations.
>+
>+        * web-platform-tests/fetch/data-urls/processing.any-expected.txt:
>+        * web-platform-tests/fetch/data-urls/processing.any.worker-expected.txt:
>+
> 2019-01-24  Charles Vazac  <cvazac@akamai.com>
> 
>         Implement PerformanceObserver.supportedEntryTypes
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-blob-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-blob-expected.txt
>index 7de610dd51064cb2680f05e3e27fba7bba9045b4..a7543a35d21441f5473617e2dfff82b4b59edc6e 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-blob-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-blob-expected.txt
>@@ -18,7 +18,7 @@ FAIL 13) MIME types need to be parsed and serialized: text/html;charset='gbk ass
> FAIL 14) MIME types need to be parsed and serialized: text/html;charset=gbk' assert_equals: expected "text/html;charset=gbk'" but got "text/html"
> FAIL 15) MIME types need to be parsed and serialized: text/html;charset=';charset=GBK assert_equals: expected "text/html;charset='" but got "text/html"
> FAIL 16) MIME types need to be parsed and serialized: text/html;test;charset=gbk assert_equals: expected "text/html;charset=gbk" but got "text/html"
>-FAIL 17) MIME types need to be parsed and serialized: text/html;test=;charset=gbk assert_equals: expected "text/html;charset=gbk" but got "application/octet-stream"
>+FAIL 17) MIME types need to be parsed and serialized: text/html;test=;charset=gbk assert_equals: expected "text/html;charset=gbk" but got "text/html"
> FAIL 18) MIME types need to be parsed and serialized: text/html;';charset=gbk assert_equals: expected "text/html;charset=gbk" but got "text/html"
> FAIL 19) MIME types need to be parsed and serialized: text/html;";charset=gbk assert_equals: expected "text/html;charset=gbk" but got "text/html"
> FAIL 20) MIME types need to be parsed and serialized: text/html ; ; charset=gbk assert_equals: expected "text/html;charset=gbk" but got "text/html"
>@@ -51,7 +51,7 @@ PASS 46) MIME types need to be parsed and serialized:
> PASS 47) MIME types need to be parsed and serialized: / 
> PASS 48) MIME types need to be parsed and serialized: bogus 
> PASS 49) MIME types need to be parsed and serialized: bogus/ 
>-FAIL 50) MIME types need to be parsed and serialized: bogus/  assert_equals: expected "application/octet-stream" but got "bogus/"
>+PASS 50) MIME types need to be parsed and serialized: bogus/  
> PASS 51) MIME types need to be parsed and serialized: bogus/bogus/; 
> PASS 52) MIME types need to be parsed and serialized: </> 
> PASS 53) MIME types need to be parsed and serialized: (/)

Actions: View | Formatted Diff | Diff

Attachments on bug 180526: 348014 | 356923 | 356928 | 357400 | 357401 | 357403 | 357443 | 357469 | 357682 | 357684 | 357687 | 357690 | 357691 | 357702 | 358515 | 358898 | 358906 | 358907 | 358917 | 359860 | 360118 | 360123 | 360129 | 360134 | 360136 | 360144 | 360303 | 360343 | 360350 | 360355 | 362245 | 362316 | 362323 | 362342 | 362348 | 362360 | 362378 | 362384 | 362387 | 362390 | 362397 | 362416 | 362418 | 362430 | 362437 | 362483 | 362486 | 362497 | 362506 | 362526 | 390349