actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-06-25 06:39:22 +02:00
Code Issues Releases Wiki Activity

encoder sent uncompressed data before compressed

Browse Source
This commit is contained in:
Nikolay Kim
2019-04-04 15:03:40 -07:00
parent 9c205f9f1d
commit 309c480782
3 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
actix-http/src/encoding/encoder.rs
View File

@ -19,6 +19,7 @@ use super::Writer;
const INPLACE: usize = 2049;
pub struct Encoder<B> {
eof: bool,
body: EncoderBody<B>,
encoder: Option<ContentEncoder>,
fut: Option<CpuFuture<ContentEncoder, io::Error>>,
@ -56,12 +57,14 @@ impl<B: MessageBody> Encoder<B> {
head.no_chunking(false);
ResponseBody::Body(Encoder {
body,
eof: false,
fut: None,
encoder: ContentEncoder::encoder(encoding),
})
} else {
ResponseBody::Body(Encoder {
body,
eof: false,
fut: None,
encoder: None,
})
@ -90,6 +93,10 @@ impl<B: MessageBody> MessageBody for Encoder<B> {
fn poll_next(&mut self) -> Poll<Option<Bytes>, Error> {
loop {
if self.eof {
return Ok(Async::Ready(None));
}
if let Some(ref mut fut) = self.fut {
let mut encoder = futures::try_ready!(fut.poll());
let chunk = encoder.take();
@ -127,10 +134,10 @@ impl<B: MessageBody> MessageBody for Encoder<B> {
encoder.write(&chunk)?;
Ok(encoder)
}));
continue;
}
} else {
return Ok(Async::Ready(Some(chunk)));
}
return Ok(Async::Ready(Some(chunk)));
}
Async::Ready(None) => {
if let Some(encoder) = self.encoder.take() {
@ -138,6 +145,7 @@ impl<B: MessageBody> MessageBody for Encoder<B> {
if chunk.is_empty() {
return Ok(Async::Ready(None));
} else {
self.eof = true;
return Ok(Async::Ready(Some(chunk)));
}
} else {