actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2025-07-01 12:15:08 +02:00
Code Issues Releases Wiki Activity

add kee-alive tests

Browse Source
This commit is contained in:
Nikolay Kim
2018-11-20 10:55:50 -08:00
parent e1fc6dea84
commit 186d3d727a
2 changed files with 146 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/h1/dispatcher.rs
View File

@ -409,7 +409,7 @@ where
if self.flags.contains(Flags::SHUTDOWN) {
return Err(DispatchError::DisconnectTimeout);
} else if self.ka_timer.as_mut().unwrap().deadline() >= self.ka_expire {
// check for any outstanding response processing
// check for any outstanding tasks
if self.state.is_empty() && self.framed.is_write_buf_empty() {
if self.flags.contains(Flags::STARTED) {
trace!("Keep-alive timeout, close connection");
@ -427,12 +427,16 @@ where
}
} else {
// timeout on first request (slow request) return 408
trace!("Slow request timeout");
self.flags.insert(Flags::STARTED | Flags::DISCONNECTED);
let _ = self.send_response(
Response::RequestTimeout().finish().drop_body(),
(),
);
if !self.flags.contains(Flags::STARTED) {
trace!("Slow request timeout");
let _ = self.send_response(
Response::RequestTimeout().finish().drop_body(),
(),
);
} else {
trace!("Keep-alive connection timeout");
}
self.flags.insert(Flags::STARTED | Flags::SHUTDOWN);
self.state = State::None;
}
} else if let Some(deadline) = self.config.keep_alive_expire() {
@ -493,11 +497,14 @@ where
false
}
// disconnect if keep-alive is not enabled
else if inner.flags.contains(Flags::STARTED) && !inner
.flags
.intersects(Flags::KEEPALIVE | Flags::KEEPALIVE_ENABLED)
else if inner.flags.contains(Flags::STARTED)
&& !inner.flags.intersects(Flags::KEEPALIVE)
{
true
}
// disconnect if shutdown
else if inner.flags.contains(Flags::SHUTDOWN) {
true
} else {
return Ok(Async::NotReady);
}