From 3385682e0919fb2469c95212103cdebecb7872df Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Mon, 2 Dec 2019 17:04:42 +0600
Subject: [PATCH] remove server feature
---
actix-connect/src/ssl/openssl.rs | 2 +-
actix-tls/Cargo.toml | 5 +----
actix-tls/src/lib.rs | 16 ----------------
3 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/actix-connect/src/ssl/openssl.rs b/actix-connect/src/ssl/openssl.rs
index 184eb198..bae1cb56 100644
--- a/actix-connect/src/ssl/openssl.rs
+++ b/actix-connect/src/ssl/openssl.rs
@@ -4,8 +4,8 @@ use std::pin::Pin;
use std::task::{Context, Poll};
use std::{fmt, io};
-use actix_rt::net::TcpStream;
use actix_codec::{AsyncRead, AsyncWrite};
+use actix_rt::net::TcpStream;
use actix_service::{Service, ServiceFactory};
use futures::future::{err, ok, Either, FutureExt, LocalBoxFuture, Ready};
use open_ssl::ssl::SslConnector;
diff --git a/actix-tls/Cargo.toml b/actix-tls/Cargo.toml
index ebcbd867..4700ab08 100644
--- a/actix-tls/Cargo.toml
+++ b/actix-tls/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
workspace = ".."
[package.metadata.docs.rs]
-features = ["server", "openssl", "rustls"]
+features = ["openssl", "rustls"]
[lib]
name = "actix_tls"
@@ -38,9 +38,6 @@ either = "1.5.2"
futures = "0.3.1"
log = "0.4"
-# server feature
-actix-server = { version = "0.8.0-alpha.1", optional=true }
-
# openssl
open-ssl = { version="0.10", package = "openssl", optional = true }
tokio-openssl = { version = "=0.4.0-alpha.6", optional = true }
diff --git a/actix-tls/src/lib.rs b/actix-tls/src/lib.rs
index 53b850d4..12b7172b 100644
--- a/actix-tls/src/lib.rs
+++ b/actix-tls/src/lib.rs
@@ -33,19 +33,3 @@ pub enum SslError<E1, E2> {
Ssl(E1),
Service(E2),
}
-
-pub trait ServerBuilderExt: Sized {
- /// Sets the maximum per-worker concurrent connection establish process.
- ///
- /// All listeners will stop accepting connections when this limit is reached. It
- /// can be used to limit the global SSL CPU usage.
- ///
- /// By default max connections is set to a 256.
- fn maxconnrate(self, num: usize) -> Self {
- max_concurrent_ssl_connect(num);
- self
- }
-}
-
-#[cfg(feature = "server")]
-impl ServerBuilderExt for actix_server::ServerBuilder {}