Auto merge of #22678 - nox:mime, r=SimonSapin

Pull mime 0.3.13 and fix a MIME comparison in EventSource  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22678)
servo · Jan 14, 2019 · b1a4913 · b1a4913
2 parents 1f9b134 + 8611b0f
commit b1a4913
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
@@ -71,7 +71,7 @@ malloc_size_of = { path = "../malloc_size_of" }
 malloc_size_of_derive = "0.1"
 metrics = {path = "../metrics"}
 mitochondria = "1.1.2"
-mime = "0.3"
+mime = "0.3.13"
 mime_guess = "2.0.0-alpha.6"
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}

diff --git a/components/script/dom/eventsource.rs b/components/script/dom/eventsource.rs
@@ -344,19 +344,15 @@ impl FetchResponseListener for EventSourceContext {
                     FetchMetadata::Unfiltered(m) => m,
                     FetchMetadata::Filtered { unsafe_, .. } => unsafe_,
                 };
-                match meta.content_type {
-                    None => self.fail_the_connection(),
-                    Some(ct) => {
-                        if <ContentType as Into<Mime>>::into(ct.into_inner()) ==
-                            mime::TEXT_EVENT_STREAM
-                        {
-                            self.origin = meta.final_url.origin().ascii_serialization();
-                            self.announce_the_connection();
-                        } else {
-                            self.fail_the_connection()
-                        }
-                    },
+                let mime = match meta.content_type {
+                    None => return self.fail_the_connection(),
+                    Some(ct) => <ContentType as Into<Mime>>::into(ct.into_inner()),
+                };
+                if (mime.type_(), mime.subtype()) != (mime::TEXT, mime::EVENT_STREAM) {
+                    return self.fail_the_connection();
                 }
+                self.origin = meta.final_url.origin().ascii_serialization();
+                self.announce_the_connection();
             },
             Err(_) => {
                 self.reestablish_the_connection();

diff --git a/tests/wpt/metadata/cors/cors-safelisted-request-header.any.js.ini b/tests/wpt/metadata/cors/cors-safelisted-request-header.any.js.ini
@@ -1,7 +1,4 @@
 [cors-safelisted-request-header.any.worker.html]
-  [No preflight for {"content-type":"text/plain;"}]
-    expected: FAIL
-
   [Preflight for {"content-type":"text/plain\\f"}]
     expected: FAIL
 
@@ -19,9 +16,6 @@
 
 
 [cors-safelisted-request-header.any.html]
-  [No preflight for {"content-type":"text/plain;"}]
-    expected: FAIL
-
   [Preflight for {"content-type":"text/plain\\f"}]
     expected: FAIL
 

diff --git a/tests/wpt/metadata/eventsource/format-mime-trailing-semicolon.htm.ini b/tests/wpt/metadata/eventsource/format-mime-trailing-semicolon.htm.ini
diff --git a/tests/wpt/metadata/fetch/data-urls/processing.any.js.ini b/tests/wpt/metadata/fetch/data-urls/processing.any.js.ini
@@ -140,9 +140,6 @@
   ["data:†,X"]
     expected: FAIL
 
-  ["data:text/plain;,X"]
-    expected: FAIL
-
   ["data:x/x;base64;base64x,WA"]
     expected: FAIL
 
@@ -292,9 +289,6 @@
   ["data:†,X"]
     expected: FAIL
 
-  ["data:text/plain;,X"]
-    expected: FAIL
-
   ["data:x/x;base64;base64x,WA"]
     expected: FAIL