Skip to content

Commit

Permalink
use ZlibDecoder for deflate responses (#1257)
Browse files Browse the repository at this point in the history
  • Loading branch information
ducaale authored Apr 26, 2021
1 parent b88f309 commit 8d3e279
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ gzip = ["async-compression", "async-compression/gzip", "tokio-util"]

brotli = ["async-compression", "async-compression/brotli", "tokio-util"]

deflate = ["async-compression", "async-compression/deflate", "tokio-util"]
deflate = ["async-compression", "async-compression/zlib", "tokio-util"]

json = ["serde_json"]

Expand Down Expand Up @@ -197,6 +197,7 @@ path = "examples/form.rs"
[[example]]
name = "simple"
path = "examples/simple.rs"
required-features = ["deflate"]

[[test]]
name = "blocking"
Expand Down
6 changes: 3 additions & 3 deletions src/async_impl/decoder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use async_compression::tokio::bufread::GzipDecoder;
use async_compression::tokio::bufread::BrotliDecoder;

#[cfg(feature = "deflate")]
use async_compression::tokio::bufread::DeflateDecoder;
use async_compression::tokio::bufread::ZlibDecoder;

use bytes::Bytes;
use futures_core::Stream;
Expand Down Expand Up @@ -57,7 +57,7 @@ enum Inner {

/// A `Deflate` decoder will uncompress the deflated response content before returning it.
#[cfg(feature = "deflate")]
Deflate(FramedRead<DeflateDecoder<StreamReader<Peekable<IoStream>, Bytes>>, BytesCodec>),
Deflate(FramedRead<ZlibDecoder<StreamReader<Peekable<IoStream>, Bytes>>, BytesCodec>),

/// A decoder that doesn't have a value yet.
#[cfg(any(feature = "brotli", feature = "gzip", feature = "deflate"))]
Expand Down Expand Up @@ -321,7 +321,7 @@ impl Future for Pending {
)))),
#[cfg(feature = "deflate")]
DecoderType::Deflate => Poll::Ready(Ok(Inner::Deflate(FramedRead::new(
DeflateDecoder::new(StreamReader::new(_body)),
ZlibDecoder::new(StreamReader::new(_body)),
BytesCodec::new(),
)))),
}
Expand Down
2 changes: 1 addition & 1 deletion tests/deflate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ async fn deflate_case(response_size: usize, chunk_size: usize) {
.into_iter()
.map(|i| format!("test {}", i))
.collect();
let mut encoder = libflate::deflate::Encoder::new(Vec::new());
let mut encoder = libflate::zlib::Encoder::new(Vec::new()).unwrap();
match encoder.write(content.as_bytes()) {
Ok(n) => assert!(n > 0, "Failed to write to encoder."),
_ => panic!("Failed to deflate encode string."),
Expand Down

0 comments on commit 8d3e279

Please sign in to comment.