aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2019-01-12 20:00:19 +0100
committerAnthony Ramine <n.oxyde@gmail.com>2019-01-14 13:01:35 +0100
commitbec1c396dee38ccdb8454769d1fdd8918061384c (patch)
tree0408c684875936926cdff17128fb75c59ec655b4
parent6197f1addad631455cb4dcb215e172896f54a9ab (diff)
downloadservo-bec1c396dee38ccdb8454769d1fdd8918061384c.tar.gz
servo-bec1c396dee38ccdb8454769d1fdd8918061384c.zip
Update mime to 0.3.13
https://github.com/hyperium/mime/pull/103
-rw-r--r--Cargo.lock16
-rw-r--r--components/script/Cargo.toml2
-rw-r--r--tests/wpt/metadata/cors/cors-safelisted-request-header.any.js.ini6
-rw-r--r--tests/wpt/metadata/eventsource/format-mime-trailing-semicolon.htm.ini4
-rw-r--r--tests/wpt/metadata/fetch/data-urls/processing.any.js.ini6
5 files changed, 9 insertions, 25 deletions
diff --git a/Cargo.lock b/Cargo.lock
index af16f9929d2..5a1044e09f4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1657,7 +1657,7 @@ dependencies = [
"headers-core 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"headers-derive 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"http 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
"sha-1 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1779,7 +1779,7 @@ dependencies = [
"headers-ext 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"http 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.12.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_bytes 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2382,7 +2382,7 @@ dependencies = [
[[package]]
name = "mime"
-version = "0.3.12"
+version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"unicase 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2393,7 +2393,7 @@ name = "mime_guess"
version = "2.0.0-alpha.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "mime 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
"phf 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)",
"phf_codegen 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)",
"unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2567,7 +2567,7 @@ dependencies = [
"malloc_size_of 0.0.1",
"malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
"mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"net_traits 0.0.1",
@@ -2619,7 +2619,7 @@ dependencies = [
"log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
"malloc_size_of 0.0.1",
"malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"pixels 0.0.1",
@@ -3252,7 +3252,7 @@ dependencies = [
"malloc_size_of 0.0.1",
"malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"metrics 0.0.1",
- "mime 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
"mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)",
"mitochondria 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"mozangle 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5018,7 +5018,7 @@ dependencies = [
"checksum memchr 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0a3eb002f0535929f1199681417029ebea04aadc0c7a4224b46be99c7f5d6a16"
"checksum memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2ffa2c986de11a9df78620c01eeaaf27d94d3ff02bf81bfcca953102dd0c6ff"
"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
-"checksum mime 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)" = "0a907b83e7b9e987032439a387e187119cddafc92d5c2aaeb1d92580a793f630"
+"checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425"
"checksum mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30de2e4613efcba1ec63d8133f344076952090c122992a903359be5a4f99c3ed"
"checksum miniz-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "609ce024854aeb19a0ef7567d348aaa5a746b32fb72e336df7fcc16869d7e2b4"
"checksum miniz_oxide 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9ba430291c9d6cedae28bcd2d49d1c32fc57d60cd49086646c5dd5673a870eb5"
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index 4d9bde6af9e..2e0bd88ea78 100644
--- 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/tests/wpt/metadata/cors/cors-safelisted-request-header.any.js.ini b/tests/wpt/metadata/cors/cors-safelisted-request-header.any.js.ini
index 654464bc02d..84de465a11b 100644
--- 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
deleted file mode 100644
index 7d8960be496..00000000000
--- a/tests/wpt/metadata/eventsource/format-mime-trailing-semicolon.htm.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[format-mime-trailing-semicolon.htm]
- [EventSource: MIME type with trailing ;]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/data-urls/processing.any.js.ini b/tests/wpt/metadata/fetch/data-urls/processing.any.js.ini
index fca83c027a5..e50ce4236ac 100644
--- 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