actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2024-11-30 18:34:36 +01:00
Code Issues Releases Wiki Activity

build docs for apln and tls features

Browse Source
This commit is contained in:
Nikolay Kim 2018-02-10 11:39:12 -08:00
parent 856055c6ca
commit 285c66e7d8
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -72,7 +72,7 @@ script:
after_success: after_success:
- | - |
if [[ "$TRAVIS_OS_NAME" == "linux" && "$TRAVIS_PULL_REQUEST" = "false" && "$TRAVIS_BRANCH" == "master" && "$TRAVIS_RUST_VERSION" == "1.21.0" ]]; then if [[ "$TRAVIS_OS_NAME" == "linux" && "$TRAVIS_PULL_REQUEST" = "false" && "$TRAVIS_BRANCH" == "master" && "$TRAVIS_RUST_VERSION" == "1.21.0" ]]; then
cargo doc --features alpn --no-deps && cargo doc --features "alpn, tls" --no-deps &&
echo "<meta http-equiv=refresh content=0;url=os_balloon/index.html>" > target/doc/index.html && echo "<meta http-equiv=refresh content=0;url=os_balloon/index.html>" > target/doc/index.html &&
cargo install mdbook && cargo install mdbook &&
cd guide && mdbook build -d ../target/doc/guide && cd .. && cd guide && mdbook build -d ../target/doc/guide && cd .. &&

5
src/server/worker.rs
View File

@ -6,15 +6,14 @@ use tokio_core::net::TcpStream;
use tokio_core::reactor::Handle; use tokio_core::reactor::Handle;
use net2::TcpStreamExt; use net2::TcpStreamExt;
#[cfg(feature="tls")] #[cfg(any(feature="tls", feature="alpn"))]
use futures::future; use futures::future;
#[cfg(feature="tls")] #[cfg(feature="tls")]
use native_tls::TlsAcceptor; use native_tls::TlsAcceptor;
#[cfg(feature="tls")] #[cfg(feature="tls")]
use tokio_tls::TlsAcceptorExt; use tokio_tls::TlsAcceptorExt;
#[cfg(feature="alpn")]
use futures::future;
#[cfg(feature="alpn")] #[cfg(feature="alpn")]
use openssl::ssl::SslAcceptor; use openssl::ssl::SslAcceptor;
#[cfg(feature="alpn")] #[cfg(feature="alpn")]