mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-11-03 15:39:50 +00:00
Code Issues Projects Releases Wiki Activity

fix keep-alive timer reset

Browse source
This commit is contained in:
Nikolay Kim 2018-11-08 09:30:53 -08:00
parent f1587243c2
commit 6a1d560f22
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Cargo.toml
View file

@ -36,9 +36,8 @@ cell = ["actix-net/cell"]
[dependencies]
actix = "0.7.5"
#actix-net = "0.1.1"
#actix-net = { path="../actix-net/" }
actix-net = { git="https://github.com/actix/actix-net.git" }
actix-net = "0.2.0"
#actix-net = { git="https://github.com/actix/actix-net.git" }
base64 = "0.9"
bitflags = "1.0"

9
src/h1/dispatcher.rs
View file

@ -441,7 +441,8 @@ where
if let Some(deadline) =
self.config.client_disconnect_timer()
{
timer.reset(deadline)
timer.reset(deadline);
let _ = timer.poll();
} else {
return Ok(());
}
@ -455,10 +456,12 @@ where
)));
}
} else if let Some(deadline) = self.config.keep_alive_expire() {
timer.reset(deadline)
timer.reset(deadline);
let _ = timer.poll();
}
} else {
timer.reset(self.ka_expire)
timer.reset(self.ka_expire);
let _ = timer.poll();
}
}
Ok(Async::NotReady) => (),