mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-11-26 19:41:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix stream draining for http/2 connections #290

Browse source
This commit is contained in:
Nikolay Kim 2018-07-25 15:38:02 -07:00
parent f58065082e
commit 80fbc2e9ec
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES.md
View file

@ -23,6 +23,8 @@
* Missing response header "content-encoding" #421 * Missing response header "content-encoding" #421
* Fix stream draining for http/2 connections #290
## [0.7.1] - 2018-07-21 ## [0.7.1] - 2018-07-21

2
src/pipeline.rs
View file

@ -409,7 +409,7 @@ struct ProcessResponse<S, H> {
_h: PhantomData<H>, _h: PhantomData<H>,
} }
#[derive(PartialEq)] #[derive(PartialEq, Debug)]
enum RunningState { enum RunningState {
Running, Running,
Paused, Paused,

4
src/server/h2.rs
View file

@ -155,7 +155,9 @@ where
} }
} }
if !item.flags.contains(EntryFlags::WRITE_DONE) { if item.flags.contains(EntryFlags::FINISHED)
&& !item.flags.contains(EntryFlags::WRITE_DONE)
{
match item.stream.poll_completed(false) { match item.stream.poll_completed(false) {
Ok(Async::NotReady) => (), Ok(Async::NotReady) => (),
Ok(Async::Ready(_)) => { Ok(Async::Ready(_)) => {

8
src/server/h2writer.rs
View file

@ -245,14 +245,18 @@ impl<H: 'static> Writer for H2Writer<H> {
let cap = cmp::min(self.buffer.len(), CHUNK_SIZE); let cap = cmp::min(self.buffer.len(), CHUNK_SIZE);
stream.reserve_capacity(cap); stream.reserve_capacity(cap);
} else { } else {
if eof {
stream.reserve_capacity(0);
continue;
}
self.flags.remove(Flags::RESERVED); self.flags.remove(Flags::RESERVED);
return Ok(Async::NotReady); return Ok(Async::Ready(()));
} }
} }
Err(e) => return Err(io::Error::new(io::ErrorKind::Other, e)), Err(e) => return Err(io::Error::new(io::ErrorKind::Other, e)),
} }
} }
} }
Ok(Async::NotReady) Ok(Async::Ready(()))
} }
} }