actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2024-11-27 17:52:56 +01:00
Code Issues Releases Wiki Activity

update deps

Browse Source
This commit is contained in:
Nikolay Kim 2019-01-26 22:09:26 -08:00
parent f2251b8059
commit 42277c5c8f
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Cargo.toml
View File

@ -37,7 +37,7 @@ session = ["cookie/secure"]
ssl = ["openssl", "actix-connector/ssl"] ssl = ["openssl", "actix-connector/ssl"]
[dependencies] [dependencies]
actix-service = "0.1.3" actix-service = "0.1.6"
actix-codec = "0.1.0" actix-codec = "0.1.0"
actix-connector = "0.1.0" actix-connector = "0.1.0"
actix-rt = "0.1.0" actix-rt = "0.1.0"
@ -50,7 +50,7 @@ actix-utils = "0.1.0"
# actix-server = { path="../actix-net/actix-server/" } # actix-server = { path="../actix-net/actix-server/" }
# actix-utils = { path="../actix-net/actix-utils/" } # actix-utils = { path="../actix-net/actix-utils/" }
base64 = "0.9" base64 = "0.10"
backtrace = "0.3" backtrace = "0.3"
bitflags = "1.0" bitflags = "1.0"
bytes = "0.4" bytes = "0.4"
@ -66,7 +66,7 @@ log = "0.4"
mime = "0.3" mime = "0.3"
net2 = "0.2" net2 = "0.2"
percent-encoding = "1.0" percent-encoding = "1.0"
rand = "0.5" rand = "0.6"
serde = "1.0" serde = "1.0"
serde_json = "1.0" serde_json = "1.0"
sha1 = "0.6" sha1 = "0.6"
@ -75,14 +75,14 @@ serde_urlencoded = "0.5.3"
time = "0.1" time = "0.1"
tokio-tcp = "0.1" tokio-tcp = "0.1"
tokio-timer = "0.2" tokio-timer = "0.2"
trust-dns-resolver = "0.10.1" trust-dns-resolver = { version="0.11.0-alpha.1", default-features = false }
# openssl # openssl
openssl = { version="0.10", optional = true } openssl = { version="0.10", optional = true }
[dev-dependencies] [dev-dependencies]
actix-web = "0.7" actix-web = "0.7"
env_logger = "0.5" env_logger = "0.6"
serde_derive = "1.0" serde_derive = "1.0"
[profile.release] [profile.release]

5
src/h1/decoder.rs
View File

@ -102,7 +102,8 @@ pub(crate) trait MessageType: Sized {
} }
// connection keep-alive state // connection keep-alive state
header::CONNECTION => { header::CONNECTION => {
ka = if let Ok(conn) = value.to_str().map(|conn| conn.trim()) { ka = if let Ok(conn) = value.to_str().map(|conn| conn.trim())
{
if conn.eq_ignore_ascii_case("keep-alive") { if conn.eq_ignore_ascii_case("keep-alive") {
Some(ConnectionType::KeepAlive) Some(ConnectionType::KeepAlive)
} else if conn.eq_ignore_ascii_case("close") { } else if conn.eq_ignore_ascii_case("close") {
@ -925,7 +926,6 @@ mod tests {
let req = parse_ready!(&mut buf); let req = parse_ready!(&mut buf);
assert_eq!(req.inner().head.ctype, Some(ConnectionType::KeepAlive)); assert_eq!(req.inner().head.ctype, Some(ConnectionType::KeepAlive));
} }
#[test] #[test]
@ -986,7 +986,6 @@ mod tests {
assert!(req.upgrade()); assert!(req.upgrade());
assert_eq!(req.inner().head.ctype, Some(ConnectionType::Upgrade)); assert_eq!(req.inner().head.ctype, Some(ConnectionType::Upgrade));
} }
#[test] #[test]

2
src/ws/transport.rs
View File

@ -7,7 +7,7 @@ use super::{Codec, Frame, Message};
pub struct Transport<S, T> pub struct Transport<S, T>
where where
S: Service<Frame, Response = Message>, S: Service<Frame, Response = Message> + 'static,
T: AsyncRead + AsyncWrite, T: AsyncRead + AsyncWrite,
{ {
inner: FramedTransport<S, T, Codec>, inner: FramedTransport<S, T, Codec>,