actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2025-01-22 23:05:56 +01:00
Code Issues Releases Wiki Activity

update actix-web

Browse Source
This commit is contained in:
Nikolay Kim 2019-03-30 08:21:47 -07:00
parent 6d90615e48
commit b95dd9f193
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Cargo.toml
View File

@ -25,7 +25,7 @@ codecov = { repository = "actix/actix-redis", branch = "master", service = "gith
default = ["web"]
# actix-web integration
web = ["actix/http", "actix-service", "actix-utils", "actix-web/cookies", "actix-session", "cookie", "rand", "serde", "serde_json"]
web = ["actix/http", "actix-service", "actix-utils", "actix-web", "actix-session/cookie-session", "rand", "serde", "serde_json"]
[dependencies]
actix = "0.8.0-alpha.2"
@ -41,11 +41,10 @@ redis-async = "0.4"
time = "0.1"
# actix web session
actix-web = { version = "1.0.0-alpha.1", optional=true }
actix-web = { version = "1.0.0-alpha.2", optional=true }
actix-utils = { version = "0.3.3", optional=true }
actix-service = { version = "0.3.4", optional=true }
actix-session = { version = "0.1.0-alpha.1", optional=true }
cookie = { version="0.11", features=["percent-encode", "secure"], optional=true }
actix-session = { version = "0.1.0-alpha.2", optional=true }
rand = { version="0.6.5", optional=true }
serde = { version="1.0", optional=true }
serde_json = { version="1.0", optional=true }

2
src/lib.rs
View File

@ -20,7 +20,7 @@ pub use redis::{Command, RedisActor};
#[cfg(feature = "web")]
mod session;
#[cfg(feature = "web")]
pub use cookie::SameSite;
pub use actix_web::cookie::SameSite;
#[cfg(feature = "web")]
pub use session::RedisSession;

2
src/session.rs
View File

@ -6,10 +6,10 @@ use actix::prelude::*;
use actix_service::{Service, Transform};
use actix_session::Session;
use actix_utils::cloneable::CloneableService;
use actix_web::cookie::{Cookie, CookieJar, Key, SameSite};
use actix_web::dev::{ServiceRequest, ServiceResponse};
use actix_web::http::header::{self, HeaderValue};
use actix_web::{error, Error, HttpMessage};
use cookie::{Cookie, CookieJar, Key, SameSite};
use futures::future::{err, ok, Either, Future, FutureResult};
use futures::Poll;
use rand::{distributions::Alphanumeric, rngs::OsRng, Rng};