1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-12-03 14:56:44 +00:00

Merge branch 'master' into feature/tools-actix

This commit is contained in:
Nikolay Kim 2018-03-07 06:09:09 -08:00 committed by GitHub
commit 1e42f9575a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions

View file

@ -27,7 +27,7 @@ name = "actix_web"
path = "src/lib.rs"
[features]
default = []
default = ["session"]
# tls
tls = ["native-tls", "tokio-tls"]
@ -35,6 +35,9 @@ tls = ["native-tls", "tokio-tls"]
# openssl
alpn = ["openssl", "openssl/v102", "openssl/v110", "tokio-openssl"]
# sessions
session = ["cookie/secure"]
[dependencies]
actix = "^0.5.2"
@ -63,7 +66,7 @@ time = "0.1"
encoding = "0.2"
language-tags = "0.2"
url = { version="1.7", features=["query_encoding"] }
cookie = { version="0.10", features=["percent-encode", "secure"] }
cookie = { version="0.10", features=["percent-encode"] }
# io
mio = "^0.6.13"

View file

@ -6,12 +6,16 @@ use httprequest::HttpRequest;
use httpresponse::HttpResponse;
mod logger;
#[cfg(feature = "session")]
mod session;
mod defaultheaders;
pub mod cors;
pub mod csrf;
pub use self::logger::Logger;
pub use self::defaultheaders::{DefaultHeaders, DefaultHeadersBuilder};
#[cfg(feature = "session")]
pub use self::session::{RequestSession, Session, SessionImpl, SessionBackend, SessionStorage,
CookieSessionError, CookieSessionBackend, CookieSessionBackendBuilder};