mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-11-20 08:31:09 +00:00
Code Issues Projects Releases Wiki Activity

use bytes::Writer

Browse source
This commit is contained in:
Nikolay Kim 2017-11-08 20:08:16 -08:00
parent 7565ed8e06
commit e9fe2ba740
1 changed files with 8 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/encoding.rs
View file

@ -124,9 +124,9 @@ impl PayloadWriter for PayloadType {
} }
enum Decoder { enum Decoder {
Deflate(DeflateDecoder<BytesWriter>), Deflate(DeflateDecoder<Writer<BytesMut>>),
Gzip(Option<GzDecoder<Wrapper>>), Gzip(Option<GzDecoder<Wrapper>>),
Br(BrotliDecoder<BytesWriter>), Br(BrotliDecoder<Writer<BytesMut>>),
Identity, Identity,
} }
@ -145,26 +145,6 @@ impl io::Read for Wrapper {
} }
} }
struct BytesWriter {
buf: BytesMut,
}
impl Default for BytesWriter {
fn default() -> BytesWriter {
BytesWriter{buf: BytesMut::with_capacity(8192)}
}
}
impl io::Write for BytesWriter {
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
self.buf.extend(buf);
Ok(buf.len())
}
fn flush(&mut self) -> io::Result<()> {
Ok(())
}
}
/// Payload wrapper with content decompression support /// Payload wrapper with content decompression support
pub(crate) struct EncodedPayload { pub(crate) struct EncodedPayload {
inner: PayloadSender, inner: PayloadSender,
@ -177,9 +157,9 @@ impl EncodedPayload {
pub fn new(inner: PayloadSender, enc: ContentEncoding) -> EncodedPayload { pub fn new(inner: PayloadSender, enc: ContentEncoding) -> EncodedPayload {
let dec = match enc { let dec = match enc {
ContentEncoding::Br => Decoder::Br( ContentEncoding::Br => Decoder::Br(
BrotliDecoder::new(BytesWriter::default())), BrotliDecoder::new(BytesMut::with_capacity(8192).writer())),
ContentEncoding::Deflate => Decoder::Deflate( ContentEncoding::Deflate => Decoder::Deflate(
DeflateDecoder::new(BytesWriter::default())), DeflateDecoder::new(BytesMut::with_capacity(8192).writer())),
ContentEncoding::Gzip => Decoder::Gzip(None), ContentEncoding::Gzip => Decoder::Gzip(None),
_ => Decoder::Identity, _ => Decoder::Identity,
}; };
@ -206,7 +186,7 @@ impl PayloadWriter for EncodedPayload {
Decoder::Br(ref mut decoder) => { Decoder::Br(ref mut decoder) => {
match decoder.finish() { match decoder.finish() {
Ok(mut writer) => { Ok(mut writer) => {
let b = writer.buf.take().freeze(); let b = writer.get_mut().take().freeze();
if !b.is_empty() { if !b.is_empty() {
self.inner.feed_data(b); self.inner.feed_data(b);
} }
@ -245,7 +225,7 @@ impl PayloadWriter for EncodedPayload {
Decoder::Deflate(ref mut decoder) => { Decoder::Deflate(ref mut decoder) => {
match decoder.try_finish() { match decoder.try_finish() {
Ok(_) => { Ok(_) => {
let b = decoder.get_mut().buf.take().freeze(); let b = decoder.get_mut().get_mut().take().freeze();
if !b.is_empty() { if !b.is_empty() {
self.inner.feed_data(b); self.inner.feed_data(b);
} }
@ -277,7 +257,7 @@ impl PayloadWriter for EncodedPayload {
match self.decoder { match self.decoder {
Decoder::Br(ref mut decoder) => { Decoder::Br(ref mut decoder) => {
if decoder.write(&data).is_ok() && decoder.flush().is_ok() { if decoder.write(&data).is_ok() && decoder.flush().is_ok() {
let b = decoder.get_mut().buf.take().freeze(); let b = decoder.get_mut().get_mut().take().freeze();
if !b.is_empty() { if !b.is_empty() {
self.inner.feed_data(b); self.inner.feed_data(b);
} }
@ -321,7 +301,7 @@ impl PayloadWriter for EncodedPayload {
Decoder::Deflate(ref mut decoder) => { Decoder::Deflate(ref mut decoder) => {
if decoder.write(&data).is_ok() && decoder.flush().is_ok() { if decoder.write(&data).is_ok() && decoder.flush().is_ok() {
let b = decoder.get_mut().buf.take().freeze(); let b = decoder.get_mut().get_mut().take().freeze();
if !b.is_empty() { if !b.is_empty() {
self.inner.feed_data(b); self.inner.feed_data(b);
} }