From 526a499d83b7ad35fb873f4bf0ecf3211f16e062 Mon Sep 17 00:00:00 2001
From: fakeshadow <24548779@qq.com>
Date: Fri, 1 Jan 2021 16:31:08 +0800
Subject: [PATCH] work in progress

---
 Cargo.toml              | 4 +---
 actix-http/CHANGES.md   | 6 ++++++
 actix-http/Cargo.toml   | 2 +-
 actix-http/src/error.rs | 9 ---------
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 43bfd17ee..9f7835a2f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -132,12 +132,10 @@ actix-files = { path = "actix-files" }
 awc = { path = "awc" }
 
 # FIXME: remove these override
-actix = { git = "https://github.com/fakeshadow/actix.git", branch = "tokio-0.3" }
+actix = { git = "https://github.com/fakeshadow/actix.git", branch = "master" }
 actix-tls = { git = "https://github.com/actix/actix-net.git", branch = "master" }
 actix-server = { git = "https://github.com/actix/actix-net.git", branch = "master" }
 actix-service = { git = "https://github.com/actix/actix-net.git", branch = "master" }
-trust-dns-proto = { git = "https://github.com/bluejekyll/trust-dns.git", branch = "main" }
-trust-dns-resolver = { git = "https://github.com/bluejekyll/trust-dns.git", branch = "main" }
 
 [[bench]]
 name = "server"
diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md
index 3fb024591..126c956e9 100644
--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@@ -9,7 +9,13 @@
 ### Removed
 * Deprecated `on_connect` methods have been removed. Prefer the new
   `on_connect_ext` technique. [#1857]
+* Remove `ResponseError` impl for `actix::actors::resolver::ResolverError`
+  due to deprecate of resolver actor. [#1813]
+* Remove `ConnectError::SslHandshakeError` and re-export of `openssl::HandshakeError`.
+  due to the removal of this type from `openssl` crate. openssl handshake error would 
+  return as `ConnectError::SslError`. [#1813]
 
+[#1813]: https://github.com/actix/actix-web/pull/1857
 [#1857]: https://github.com/actix/actix-web/pull/1857
 
 
diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml
index 17cafb4de..5297b306a 100644
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@@ -56,7 +56,7 @@ copyless = "0.1.4"
 derive_more = "0.99.2"
 either = "1.5.3"
 encoding_rs = "0.8"
-futures-channel = { version = "0.3.5", default-features = false }
+futures-channel = { version = "0.3.7", default-features = false }
 futures-core = { version = "0.3.7", default-features = false }
 futures-util = { version = "0.3.7", default-features = false, features = ["sink"] }
 fxhash = "0.2.1"
diff --git a/actix-http/src/error.rs b/actix-http/src/error.rs
index daf8677ba..03e5467c5 100644
--- a/actix-http/src/error.rs
+++ b/actix-http/src/error.rs
@@ -180,10 +180,6 @@ impl ResponseError for FormError {}
 /// `InternalServerError` for `openssl::ssl::Error`
 impl ResponseError for actix_tls::accept::openssl::SslError {}
 
-// #[cfg(feature = "openssl")]
-// /// `InternalServerError` for `openssl::ssl::HandshakeError`
-// impl<T: std::fmt::Debug> ResponseError for actix_tls::openssl::HandshakeError<T> {}
-
 /// Return `BAD_REQUEST` for `de::value::Error`
 impl ResponseError for DeError {
     fn status_code(&self) -> StatusCode {
@@ -956,11 +952,6 @@ where
 /// This is supported on feature=`actors` only
 impl ResponseError for actix::MailboxError {}
 
-#[cfg(feature = "actors")]
-/// `InternalServerError` for `actix::ResolverError`
-/// This is supported on feature=`actors` only
-impl ResponseError for actix::actors::resolver::ResolverError {}
-
 #[cfg(test)]
 mod tests {
     use super::*;