Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #9542 - timvandermeij:immeta, r=jdm

Browse source 
Update immeta dependency to resolve ImageCacheThread panic

Fixes #9501.

Before this patch, a website such as http://www.universiteitleiden.nl would consistently crash Servo. After this patch, the website loads just fine.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9542)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-02-06 04:02:47 +05:30
commit 3498deca39
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/net/Cargo.toml
View file

@ -40,4 +40,4 @@ flate2 = "0.2.0"
uuid = "0.1.16"
url = {version = "0.5.4", features = ["heap_size"]}
websocket = "0.14.0"
immeta = "0.2"
immeta = "0.3.1"

4
components/servo/Cargo.lock generated
View file

@ -885,7 +885,7 @@ dependencies = [
[[package]]
name = "immeta"
version = "0.2.4"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1205,7 +1205,7 @@ dependencies = [
"devtools_traits 0.0.1",
"flate2 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"immeta 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"immeta 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.0 (git+https://github.com/servo/ipc-channel)",
"log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"mime_guess 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",

4
ports/cef/Cargo.lock generated
View file

@ -816,7 +816,7 @@ dependencies = [
[[package]]
name = "immeta"
version = "0.2.4"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1136,7 +1136,7 @@ dependencies = [
"devtools_traits 0.0.1",
"flate2 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"immeta 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"immeta 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.0 (git+https://github.com/servo/ipc-channel)",
"log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"mime_guess 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",

4
ports/gonk/Cargo.lock generated
View file

@ -798,7 +798,7 @@ dependencies = [
[[package]]
name = "immeta"
version = "0.2.4"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1118,7 +1118,7 @@ dependencies = [
"devtools_traits 0.0.1",
"flate2 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"immeta 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"immeta 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.0 (git+https://github.com/servo/ipc-channel)",
"log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"mime_guess 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",