actix/examples
1
0
Fork 0
mirror of https://github.com/actix/examples synced 2025-01-22 22:05:57 +01:00
Code Issues Releases Wiki Activity

fix rustls example with updated rustls in actix-web (#55)

Browse Source
This commit is contained in:
Jan Niehusmann 2018-10-14 19:30:18 +02:00 committed by Douman
parent 98d060184f
commit 30623edfe1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rustls/Cargo.toml
View File

@ -10,6 +10,6 @@ path = "src/main.rs"
[dependencies] [dependencies]
env_logger = "0.5" env_logger = "0.5"
rustls = "0.13" rustls = "0.14"
actix = "0.7" actix = "0.7"
actix-web = { version = "0.7", features=["rust-tls"] } actix-web = { version = "0.7", features=["rust-tls"] }

8
rustls/src/main.rs
View File

@ -9,6 +9,7 @@ use std::io::BufReader;
use actix_web::{http, middleware, server, App, Error, HttpRequest, HttpResponse}; use actix_web::{http, middleware, server, App, Error, HttpRequest, HttpResponse};
use rustls::internal::pemfile::{certs, rsa_private_keys}; use rustls::internal::pemfile::{certs, rsa_private_keys};
use rustls::{NoClientAuth, ServerConfig}; use rustls::{NoClientAuth, ServerConfig};
use server::ServerFlags;
use actix_web::fs::StaticFiles; use actix_web::fs::StaticFiles;
@ -36,7 +37,10 @@ fn main() {
config.set_single_cert(cert_chain, keys.remove(0)).unwrap(); config.set_single_cert(cert_chain, keys.remove(0)).unwrap();
// actix acceptor // actix acceptor
let acceptor = server::RustlsAcceptor::new(config); let acceptor = server::RustlsAcceptor::with_flags(
config,
ServerFlags::HTTP1 | ServerFlags::HTTP2,
);
server::new(|| { server::new(|| {
App::new() App::new()
@ -51,7 +55,7 @@ fn main() {
.finish() .finish()
})) }))
.handler("/static", StaticFiles::new("static").unwrap()) .handler("/static", StaticFiles::new("static").unwrap())
}).bind_with("127.0.0.1:8443", acceptor) }).bind_with("127.0.0.1:8443", move || acceptor.clone())
.unwrap() .unwrap()
.start(); .start();