berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into feat/files/filter

This commit is contained in:
Ali MJ Al-Nasrawy 2021-06-22 17:20:27 +03:00 committed by GitHub
parent fc5b040643 2d8530feb3
commit 13ff7759d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -103,7 +103,7 @@ time = { version = "0.2.23", default-features = false, features = ["std"] }
url = "2.1" url = "2.1"
[dev-dependencies] [dev-dependencies]
actix-test = { version = "0.1.0-beta.2", features = ["openssl", "rustls"] } actix-test = { version = "0.1.0-beta.3", features = ["openssl", "rustls"] }
awc = { version = "3.0.0-beta.6", features = ["openssl"] } awc = { version = "3.0.0-beta.6", features = ["openssl"] }
brotli2 = "0.3.2" brotli2 = "0.3.2"

2
actix-files/Cargo.toml
View File

@ -36,4 +36,4 @@ percent-encoding = "2.1"
[dev-dependencies] [dev-dependencies]
actix-rt = "2.2" actix-rt = "2.2"
actix-web = "4.0.0-beta.7" actix-web = "4.0.0-beta.7"
actix-test = "0.1.0-beta.2" actix-test = "0.1.0-beta.3"

4
actix-test/CHANGES.md
View File

@ -3,6 +3,10 @@
## Unreleased - 2021-xx-xx ## Unreleased - 2021-xx-xx
## 0.1.0-beta.3 - 2021-06-20
* No significant changes from `0.1.0-beta.2`.
## 0.1.0-beta.2 - 2021-04-17 ## 0.1.0-beta.2 - 2021-04-17
* No significant changes from `0.1.0-beta.1`. * No significant changes from `0.1.0-beta.1`.

2
actix-test/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "actix-test" name = "actix-test"
version = "0.1.0-beta.2" version = "0.1.0-beta.3"
authors = [ authors = [
"Nikolay Kim <fafhrd91@gmail.com>", "Nikolay Kim <fafhrd91@gmail.com>",
"Rob Ede <robjtede@icloud.com>", "Rob Ede <robjtede@icloud.com>",

3
actix-web-actors/CHANGES.md
View File

@ -1,6 +1,9 @@
# Changes # Changes
## Unreleased - 2021-xx-xx ## Unreleased - 2021-xx-xx
* Update `actix` to `0.12`. [#2277]
[#2277]: https://github.com/actix/actix-web/pull/2277
## 4.0.0-beta.5 - 2021-06-17 ## 4.0.0-beta.5 - 2021-06-17

4
actix-web-actors/Cargo.toml
View File

@ -16,7 +16,7 @@ name = "actix_web_actors"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
actix = { version = "0.11.0-beta.3", default-features = false } actix = { version = "0.12.0", default-features = false }
actix-codec = "0.4.0" actix-codec = "0.4.0"
actix-http = "3.0.0-beta.7" actix-http = "3.0.0-beta.7"
actix-web = { version = "4.0.0-beta.7", default-features = false } actix-web = { version = "4.0.0-beta.7", default-features = false }
@ -29,7 +29,7 @@ tokio = { version = "1", features = ["sync"] }
[dev-dependencies] [dev-dependencies]
actix-rt = "2.2" actix-rt = "2.2"
actix-test = "0.1.0-beta.2" actix-test = "0.1.0-beta.3"
awc = { version = "3.0.0-beta.6", default-features = false } awc = { version = "3.0.0-beta.6", default-features = false }
env_logger = "0.8" env_logger = "0.8"

2
actix-web-codegen/Cargo.toml
View File

@ -20,7 +20,7 @@ proc-macro2 = "1"
[dev-dependencies] [dev-dependencies]
actix-rt = "2.2" actix-rt = "2.2"
actix-test = "0.1.0-beta.2" actix-test = "0.1.0-beta.3"
actix-utils = "3.0.0" actix-utils = "3.0.0"
actix-web = "4.0.0-beta.7" actix-web = "4.0.0-beta.7"

2
awc/Cargo.toml
View File

@ -83,7 +83,7 @@ actix-http-test = { version = "3.0.0-beta.4", features = ["openssl"] }
actix-utils = "3.0.0" actix-utils = "3.0.0"
actix-server = "2.0.0-beta.3" actix-server = "2.0.0-beta.3"
actix-tls = { version = "3.0.0-beta.5", features = ["openssl", "rustls"] } actix-tls = { version = "3.0.0-beta.5", features = ["openssl", "rustls"] }
actix-test = { version = "0.1.0-beta.2", features = ["openssl", "rustls"] } actix-test = { version = "0.1.0-beta.3", features = ["openssl", "rustls"] }
brotli2 = "0.3.2" brotli2 = "0.3.2"
env_logger = "0.8" env_logger = "0.8"

1
src/config.rs
View File

@ -116,6 +116,7 @@ impl AppConfig {
AppConfig { secure, host, addr } AppConfig { secure, host, addr }
} }
/// Needed in actix-test crate.
#[doc(hidden)] #[doc(hidden)]
pub fn __priv_test_new(secure: bool, host: String, addr: SocketAddr) -> Self { pub fn __priv_test_new(secure: bool, host: String, addr: SocketAddr) -> Self {
AppConfig::new(secure, host, addr) AppConfig::new(secure, host, addr)