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

use actix 0.5.4

Browse source
This commit is contained in:
Nikolay Kim 2018-03-16 13:37:47 -07:00
parent 381b90e9a1
commit 1fe4315c94
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -42,7 +42,7 @@ session = ["cookie/secure"]
brotli = ["brotli2"] brotli = ["brotli2"]
[dependencies] [dependencies]
actix = "^0.5.2" actix = "^0.5.4"
base64 = "0.9" base64 = "0.9"
bitflags = "1.0" bitflags = "1.0"

2
src/context.rs
View file

@ -188,7 +188,7 @@ impl<A, S> ActorHttpContext for HttpContext<A, S> where A: Actor<Context=Self>,
mem::transmute(self as &mut HttpContext<A, S>) mem::transmute(self as &mut HttpContext<A, S>)
}; };
if !self.inner.started() || self.inner.started() && self.inner.alive() { if self.inner.alive() {
match self.inner.poll(ctx) { match self.inner.poll(ctx) {
Ok(Async::NotReady) | Ok(Async::Ready(())) => (), Ok(Async::NotReady) | Ok(Async::Ready(())) => (),
Err(_) => return Err(ErrorInternalServerError("error").into()), Err(_) => return Err(ErrorInternalServerError("error").into()),

5
src/ws/context.rs
View file

@ -204,9 +204,8 @@ impl<A, S> ActorHttpContext for WebsocketContext<A, S> where A: Actor<Context=Se
mem::transmute(self as &mut WebsocketContext<A, S>) mem::transmute(self as &mut WebsocketContext<A, S>)
}; };
if (!self.inner.started() || self.inner.started() && self.inner.alive()) if self.inner.alive() && self.inner.poll(ctx).is_err() {
&& self.inner.poll(ctx).is_err() { return Err(ErrorInternalServerError("error").into())
return Err(ErrorInternalServerError("error").into())
} }
// frames // frames