mirror of https://github.com/fafhrd91/actix-web
work in progress
This commit is contained in:
parent
30d5fe5478
commit
526a499d83
|
@ -132,12 +132,10 @@ actix-files = { path = "actix-files" }
|
||||||
awc = { path = "awc" }
|
awc = { path = "awc" }
|
||||||
|
|
||||||
# FIXME: remove these override
|
# 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-tls = { git = "https://github.com/actix/actix-net.git", branch = "master" }
|
||||||
actix-server = { 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" }
|
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]]
|
[[bench]]
|
||||||
name = "server"
|
name = "server"
|
||||||
|
|
|
@ -9,7 +9,13 @@
|
||||||
### Removed
|
### Removed
|
||||||
* Deprecated `on_connect` methods have been removed. Prefer the new
|
* Deprecated `on_connect` methods have been removed. Prefer the new
|
||||||
`on_connect_ext` technique. [#1857]
|
`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
|
[#1857]: https://github.com/actix/actix-web/pull/1857
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,7 @@ copyless = "0.1.4"
|
||||||
derive_more = "0.99.2"
|
derive_more = "0.99.2"
|
||||||
either = "1.5.3"
|
either = "1.5.3"
|
||||||
encoding_rs = "0.8"
|
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-core = { version = "0.3.7", default-features = false }
|
||||||
futures-util = { version = "0.3.7", default-features = false, features = ["sink"] }
|
futures-util = { version = "0.3.7", default-features = false, features = ["sink"] }
|
||||||
fxhash = "0.2.1"
|
fxhash = "0.2.1"
|
||||||
|
|
|
@ -180,10 +180,6 @@ impl ResponseError for FormError {}
|
||||||
/// `InternalServerError` for `openssl::ssl::Error`
|
/// `InternalServerError` for `openssl::ssl::Error`
|
||||||
impl ResponseError for actix_tls::accept::openssl::SslError {}
|
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`
|
/// Return `BAD_REQUEST` for `de::value::Error`
|
||||||
impl ResponseError for DeError {
|
impl ResponseError for DeError {
|
||||||
fn status_code(&self) -> StatusCode {
|
fn status_code(&self) -> StatusCode {
|
||||||
|
@ -956,11 +952,6 @@ where
|
||||||
/// This is supported on feature=`actors` only
|
/// This is supported on feature=`actors` only
|
||||||
impl ResponseError for actix::MailboxError {}
|
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)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
Loading…
Reference in New Issue