fix(tokio-proto): return end-of-body frame correctly for tokio-proto

Closes #1414
This commit is contained in:
Sean McArthur
2018-01-16 14:07:50 -08:00
parent 73511ac8be
commit 14e4c741dc
2 changed files with 40 additions and 14 deletions

View File

@@ -75,7 +75,6 @@ impl Decoder {
// methods
pub fn is_eof(&self) -> bool {
trace!("is_eof? {:?}", self);
match self.kind {
Length(0) |
Chunked(ChunkedState::End, _) |
@@ -85,16 +84,15 @@ impl Decoder {
}
pub fn decode<R: MemRead>(&mut self, body: &mut R) -> Poll<Bytes, io::Error> {
trace!("decode; state={:?}", self.kind);
match self.kind {
Length(ref mut remaining) => {
trace!("Sized read, remaining={:?}", remaining);
if *remaining == 0 {
Ok(Async::Ready(Bytes::new()))
} else {
let to_read = *remaining as usize;
let buf = try_ready!(body.read_mem(to_read));
let num = buf.as_ref().len() as u64;
trace!("Length read: {}", num);
if num > *remaining {
*remaining = 0;
} else if num == 0 {