mirror of https://github.com/fafhrd91/actix-web
Moved actix-http for actix from actix crate
This commit is contained in:
parent
1249262c35
commit
cde22e4218
|
@ -15,7 +15,7 @@ license = "MIT/Apache-2.0"
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
|
|
||||||
[package.metadata.docs.rs]
|
[package.metadata.docs.rs]
|
||||||
features = ["openssl", "rustls", "failure", "compress", "secure-cookies"]
|
features = ["openssl", "rustls", "failure", "compress", "secure-cookies","actix"]
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
name = "actix_http"
|
name = "actix_http"
|
||||||
|
@ -39,6 +39,10 @@ failure = ["fail-ure"]
|
||||||
# support for secure cookies
|
# support for secure cookies
|
||||||
secure-cookies = ["ring"]
|
secure-cookies = ["ring"]
|
||||||
|
|
||||||
|
# support for actix Actor messages
|
||||||
|
actix = ["actix"]
|
||||||
|
resolver = ["actix/resolver"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
actix-service = "1.0.1"
|
actix-service = "1.0.1"
|
||||||
actix-codec = "0.2.0"
|
actix-codec = "0.2.0"
|
||||||
|
@ -47,6 +51,7 @@ actix-utils = "1.0.3"
|
||||||
actix-rt = "1.0.0"
|
actix-rt = "1.0.0"
|
||||||
actix-threadpool = "0.3.1"
|
actix-threadpool = "0.3.1"
|
||||||
actix-tls = { version = "1.0.0", optional = true }
|
actix-tls = { version = "1.0.0", optional = true }
|
||||||
|
actix = { version = "0.10.0-alpha.1", default_features = false, optional = true }
|
||||||
|
|
||||||
base64 = "0.11"
|
base64 = "0.11"
|
||||||
bitflags = "1.2"
|
bitflags = "1.2"
|
||||||
|
|
|
@ -951,6 +951,14 @@ where
|
||||||
/// Compatibility for `failure::Error`
|
/// Compatibility for `failure::Error`
|
||||||
impl ResponseError for fail_ure::Error {}
|
impl ResponseError for fail_ure::Error {}
|
||||||
|
|
||||||
|
#[cfg(feature = "actix")]
|
||||||
|
/// `InternalServerError` for `actix::MailboxError`
|
||||||
|
impl ResponseError for actix::MailboxError {}
|
||||||
|
|
||||||
|
#[cfg(all(feature = "actix", feature = "resolver"))]
|
||||||
|
/// `InternalServerError` for `actix::ResolverError`
|
||||||
|
impl ResponseError for actix::actors::resolver::ResolverError {}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
Loading…
Reference in New Issue