forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test(server): fix reading from socket in maybe_notify when state is closed

Browse Source
This commit is contained in:
Sean McArthur
2017-09-24 23:35:26 -07:00
parent 1a9f264826
commit 6aeec70653
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/http/conn.rs
View File

@@ -211,12 +211,12 @@ where I: AsyncRead + AsyncWrite,
// //
// When writing finishes, we need to wake the task up in case there // When writing finishes, we need to wake the task up in case there
// is more reading that can be done, to start a new message. // is more reading that can be done, to start a new message.
match self.state.reading { let wants_read = match self.state.reading {
Reading::Body(..) | Reading::Body(..) |
Reading::KeepAlive => return, Reading::KeepAlive => return,
Reading::Init | Reading::Init => true,
Reading::Closed => (), Reading::Closed => false,
} };
match self.state.writing { match self.state.writing {
Writing::Continue(..) | Writing::Continue(..) |
@@ -228,10 +228,13 @@ where I: AsyncRead + AsyncWrite,
} }
if !self.io.is_read_blocked() { if !self.io.is_read_blocked() {
if self.io.read_buf().is_empty() { if wants_read && self.io.read_buf().is_empty() {
match self.io.read_from_io() { match self.io.read_from_io() {
Ok(Async::Ready(_)) => (), Ok(Async::Ready(_)) => (),
Ok(Async::NotReady) => return, Ok(Async::NotReady) => {
trace!("maybe_notify; read_from_io blocked");
return
},
Err(e) => { Err(e) => {
trace!("maybe_notify read_from_io error: {}", e); trace!("maybe_notify read_from_io error: {}", e);
self.state.close(); self.state.close();