diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-02-06 04:02:47 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-02-06 04:02:47 +0530 |
| commit | 3498deca39309fe919be203aad9a5f2c0cc6f098 (patch) | |
| tree | 88c8118ae1ae9bf4e830f701e085ed0088536dd0 /components | |
| parent | 5505bf1de50bb0b19c393739d29dadd2b2079171 (diff) | |
| parent | f4f42b260bca70fe2f09a15d7c811ee4bbd151f2 (diff) | |
| download | servo-3498deca39309fe919be203aad9a5f2c0cc6f098.tar.gz servo-3498deca39309fe919be203aad9a5f2c0cc6f098.zip | |
Auto merge of #9542 - timvandermeij:immeta, r=jdm
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 -->
Diffstat (limited to 'components')
| -rw-r--r-- | components/net/Cargo.toml | 2 | ||||
| -rw-r--r-- | components/servo/Cargo.lock | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index 0c5e34874d0..5364a75559d 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -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" diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 49672e9246b..15d0f27e56f 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -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)", |