aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
Diffstat (limited to 'components')
-rw-r--r--components/net/Cargo.toml2
-rw-r--r--components/net/http_loader.rs2
-rw-r--r--components/servo/Cargo.lock14
3 files changed, 13 insertions, 5 deletions
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
index 8ee59cfb98e..2ee5e73bbba 100644
--- a/components/net/Cargo.toml
+++ b/components/net/Cargo.toml
@@ -10,7 +10,7 @@ path = "lib.rs"
[dependencies]
bitflags = "0.7"
-brotli = {git = "https://github.com/ende76/brotli-rs"}
+brotli = "1.0.6"
content-blocker = "0.2"
cookie = { version = "0.2.5", features = ["serialize-serde", "serialize-rustc" ] }
device = {git = "https://github.com/servo/devices"}
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index 6a4de828b24..fa768670c74 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -570,7 +570,7 @@ impl StreamedResponse {
Decoder::Deflate(DeflateDecoder::new(response))
}
Some(Encoding::EncodingExt(ref ext)) if ext == "br" => {
- Decoder::Brotli(Decompressor::new(response))
+ Decoder::Brotli(Decompressor::new(response, 1024))
}
_ => {
Decoder::Plain(response)
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 7103bee63c9..b886ef4296f 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -58,6 +58,11 @@ dependencies = [
]
[[package]]
+name = "alloc-no-stdlib"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
name = "android_glue"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -184,8 +189,11 @@ dependencies = [
[[package]]
name = "brotli"
-version = "0.3.23"
-source = "git+https://github.com/ende76/brotli-rs#d8507fd07e9fa57ed8251d5dc500dcd62df62c7c"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "alloc-no-stdlib 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
[[package]]
name = "browserhtml"
@@ -1391,7 +1399,7 @@ name = "net"
version = "0.0.1"
dependencies = [
"bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "brotli 0.3.23 (git+https://github.com/ende76/brotli-rs)",
+ "brotli 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"content-blocker 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"device 0.0.1 (git+https://github.com/servo/devices)",