Skip to content

Commit

Permalink
update openssl support
Browse files Browse the repository at this point in the history
  • Loading branch information
fafhrd91 committed Sep 28, 2018
1 parent 9f1417a commit b6a1cfa
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions src/server/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ where
}
}

/// This trait indicates types that can create acceptor service for http server.
pub trait AcceptorServiceFactory: Send + Clone + 'static {
type Io: IoStream + Send;
type NewService: NewService<
Expand Down Expand Up @@ -217,6 +218,7 @@ where
}

#[derive(Clone)]
/// Default acceptor service convert `TcpStream` to a `tokio_tcp::TcpStream`
pub(crate) struct DefaultAcceptor;

impl AcceptorServiceFactory for DefaultAcceptor {
Expand Down
2 changes: 0 additions & 2 deletions src/server/h1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -513,9 +513,7 @@ mod tests {
use std::{cmp, io, time};

use bytes::{Buf, Bytes, BytesMut};
use futures::future;
use http::{Method, Version};
use tokio::runtime::current_thread;
use tokio_io::{AsyncRead, AsyncWrite};

use super::*;
Expand Down
4 changes: 4 additions & 0 deletions src/server/http.rs
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ where
mut self, lst: net::TcpListener, builder: SslAcceptorBuilder,
) -> io::Result<Self> {
use super::{openssl_acceptor_with_flags, ServerFlags};
use actix_net::service::NewServiceExt;

let flags = if self.no_http2 {
ServerFlags::HTTP1
Expand All @@ -283,6 +284,7 @@ where
addr,
scheme: "https",
handler: Box::new(HttpServiceBuilder::new(
self.factory.clone(),
move || ssl::OpensslAcceptor::new(acceptor.clone()).map_err(|_| ()),
DefaultPipelineFactory::new(
self.factory.clone(),
Expand Down Expand Up @@ -411,6 +413,7 @@ where
S: net::ToSocketAddrs,
{
use super::{openssl_acceptor_with_flags, ServerFlags};
use actix_net::service::NewServiceExt;

let sockets = self.bind2(addr)?;

Expand All @@ -431,6 +434,7 @@ where
addr,
scheme: "https",
handler: Box::new(HttpServiceBuilder::new(
self.factory.clone(),
move || ssl::OpensslAcceptor::new(accpt.clone()).map_err(|_| ()),
DefaultPipelineFactory::new(
self.factory.clone(),
Expand Down

0 comments on commit b6a1cfa

Please sign in to comment.