actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2024-11-27 19:12:56 +01:00
Code Issues Releases Wiki Activity

fix rustls acceptor

Browse Source
This commit is contained in:
Nikolay Kim 2019-11-19 18:54:36 +06:00
parent 3bf83c1d98
commit d3c5518646
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
actix-server-config/Cargo.toml
View File

@ -25,4 +25,5 @@ rustls = ["tokio-rustls"]
tokio-io = "0.2.0-alpha.6"
tokio-net = "0.2.0-alpha.6"
tokio-openssl = { version = "0.4.0-alpha.6", optional = true }
tokio-rustls = { version = "0.12.0-alpha.8", optional = true }
#tokio-rustls = { version = "0.12.0-alpha.8", optional = true }
tokio-rustls = { git = "https://github.com/quininer/tokio-rustls.git", branch = "tokio-0.2", optional = true }

14
actix-server/src/ssl/rustls.rs
View File

@ -111,10 +111,14 @@ impl<T: AsyncRead + AsyncWrite + Unpin, P> Future for RustlsAcceptorServiceFut<T
fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
let this = self.get_mut();
let params = this.params.take().unwrap();
Poll::Ready(
futures::ready!(Pin::new(&mut this.fut).poll(cx))
.map(move |io| Io::from_parts(io, params, Protocol::Unknown)),
)
let res = futures::ready!(Pin::new(&mut this.fut).poll(cx));
match res {
Ok(io) => {
let params = this.params.take().unwrap();
Poll::Ready(Ok(Io::from_parts(io, params, Protocol::Unknown)))
}
Err(e) => Poll::Ready(Err(e)),
}
}
}