mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-12-04 15:26:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into cookie-handling

Browse source
This commit is contained in:
Nikolay Kim 2018-03-07 06:12:37 -08:00 committed by GitHub
commit 9e0e081c90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Cargo.toml
View file

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

4
src/middleware/mod.rs
View file

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

2
tools/wsload/Cargo.toml
View file

@ -17,5 +17,5 @@ rand = "0.4"
time = "*" time = "*"
num_cpus = "1" num_cpus = "1"
tokio-core = "0.1" tokio-core = "0.1"
actix = { git = "https://github.com/actix/actix.git" } actix = "0.5"
actix-web = { path="../../" } actix-web = { path="../../" }