Merge branch 'master' into feature/relaxed-sec-websocket-protocols-parsing

CHANGES.md

@@ -1,6 +1,6 @@
 # Changes
 
-## [2.0.0-alpha.3] - 2019-12-xx
+## [2.0.0-alpha.3] - 2019-12-07
 
 ### Changed
 

Cargo.toml

@@ -49,13 +49,13 @@ default = ["brotli", "flate2-zlib", "client", "fail"]
 client = ["awc"]
 
 # brotli encoding, requires c compiler
-brotli = ["actix-http/brotli"]
+brotli = ["actix-http/brotli", "awc/brotli"]
 
 # miniz-sys backend for flate2 crate
-flate2-zlib = ["actix-http/flate2-zlib"]
+flate2-zlib = ["actix-http/flate2-zlib", "awc/flate2-zlib"]
 
 # rust backend for flate2 crate
-flate2-rust = ["actix-http/flate2-rust"]
+flate2-rust = ["actix-http/flate2-rust", "awc/flate2-rust"]
 
 # sessions feature, session require "ring" crate and c compiler
 secure-cookies = ["actix-http/secure-cookies"]
@@ -80,8 +80,8 @@ actix-threadpool = "0.3.0"
 actix-tls = { version = "1.0.0-alpha.3" }
 
 actix-web-codegen = "0.2.0-alpha.2"
-actix-http = "0.3.0-alpha.2"
+actix-http = "1.0.0-alpha.3"
-awc = { version = "0.3.0-alpha.2", optional = true }
+awc = { version = "1.0.0-alpha.3", default-features = false, optional = true }
 
 bytes = "0.5.2"
 derive_more = "0.99.2"
@@ -93,7 +93,7 @@ mime = "0.3"
 net2 = "0.2.33"
 parking_lot = "0.9"
 pin-project = "0.4.6"
-regex = "1.0"
+regex = "1.3"
 serde = { version = "1.0", features=["derive"] }
 serde_json = "1.0"
 serde_urlencoded = "0.6.1"
@@ -106,8 +106,8 @@ rust-tls = { version = "0.16", package="rustls", optional = true }
 
 [dev-dependencies]
 # actix = "0.8.3"
-actix-connect = "1.0.0-alpha.2"
+actix-connect = "1.0.0-alpha.3"
-actix-http-test = "0.3.0-alpha.2"
+actix-http-test = "1.0.0-alpha.3"
 rand = "0.7"
 env_logger = "0.6"
 serde_derive = "1.0"
@@ -130,13 +130,3 @@ actix-session = { path = "actix-session" }
 actix-files = { path = "actix-files" }
 actix-multipart = { path = "actix-multipart" }
 awc = { path = "awc" }
-
-actix-codec = { git = "https://github.com/actix/actix-net.git" }
-actix-connect = { git = "https://github.com/actix/actix-net.git" }
-actix-rt = { git = "https://github.com/actix/actix-net.git" }
-actix-server = { git = "https://github.com/actix/actix-net.git" }
-actix-service = { git = "https://github.com/actix/actix-net.git" }
-actix-testing = { git = "https://github.com/actix/actix-net.git" }
-actix-tls = { git = "https://github.com/actix/actix-net.git" }
-actix-utils = { git = "https://github.com/actix/actix-net.git" }
-actix-router = { git = "https://github.com/actix/actix-net.git" }

actix-cors/CHANGES.md

@@ -1,6 +1,6 @@
 # Changes
 
-## [0.2.0-alpha.3] - unreleased
+## [0.2.0-alpha.3] - 2019-12-07
 
 * Migrate to actix-web 2.0.0
 

actix-cors/Cargo.toml

@@ -17,10 +17,10 @@ name = "actix_cors"
 path = "src/lib.rs"
 
 [dependencies]
-actix-web = "2.0.0-alpha.1"
+actix-web = "2.0.0-alpha.3"
-actix-service = "1.0.0-alpha.2"
+actix-service = "1.0.0-alpha.3"
 derive_more = "0.99.2"
 futures = "0.3.1"
 
 [dev-dependencies]
-actix-rt = "1.0.0-alpha.2"
+actix-rt = "1.0.0-alpha.3"

actix-files/CHANGES.md

@@ -1,6 +1,6 @@
 # Changes
 
-## [0.2.0-alpha.2] - 2019-12-03
+## [0.2.0-alpha.7] - 2019-12-07
 
 * Migrate to `std::future`
 

actix-files/Cargo.toml

@@ -18,8 +18,8 @@ name = "actix_files"
 path = "src/lib.rs"
 
 [dependencies]
-actix-web = { version = "2.0.0-alpha.2", default-features = false }
+actix-web = { version = "2.0.0-alpha.3", default-features = false }
-actix-http = "0.3.0-alpha.2"
+actix-http = "1.0.0-alpha.3"
 actix-service = "1.0.0-alpha.3"
 bitflags = "1"
 bytes = "0.5.2"
@@ -32,5 +32,5 @@ percent-encoding = "2.1"
 v_htmlescape = "0.4"
 
 [dev-dependencies]
-actix-rt = "1.0.0-alpha.2"
+actix-rt = "1.0.0-alpha.3"
-actix-web = { version = "2.0.0-alpha.2", features=["openssl"] }
+actix-web = { version = "2.0.0-alpha.3", features=["openssl"] }

actix-framed/Cargo.toml

@@ -24,7 +24,7 @@ actix-codec = "0.2.0-alpha.3"
 actix-service = "1.0.0-alpha.3"
 actix-router = "0.2.0"
 actix-rt = "1.0.0-alpha.3"
-actix-http = "0.3.0-alpha.3"
+actix-http = "1.0.0-alpha.3"
 
 bytes = "0.5.2"
 futures = "0.3.1"
@@ -34,5 +34,5 @@ log = "0.4"
 [dev-dependencies]
 actix-server = { version = "1.0.0-alpha.3" }
 actix-connect = { version = "1.0.0-alpha.3", features=["openssl"] }
-actix-http-test = { version = "0.3.0-alpha.3", features=["openssl"] }
+actix-http-test = { version = "1.0.0-alpha.3", features=["openssl"] }
 actix-utils = "1.0.0-alpha.3"

actix-http/CHANGES.md

@@ -1,5 +1,14 @@
 # Changes
 
+## [1.0.0-alpha.3] - 2019-12-07
+
+### Changed
+
+* Migrate to tokio 0.2
+
+* Migrate to `std::future`
+
+
 ## [0.2.11] - 2019-11-06
 
 ### Added

actix-http/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-http"
-version = "0.3.0-alpha.3"
+version = "1.0.0-alpha.3"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix http primitives"
 readme = "README.md"
@@ -65,7 +65,7 @@ either = "1.5.2"
 encoding_rs = "0.8"
 futures = "0.3.1"
 fxhash = "0.2.1"
-h2 = "0.2.0"
+h2 = "0.2.1"
 http = "0.2.0"
 httparse = "1.3"
 indexmap = "1.2"
@@ -97,7 +97,7 @@ failure = { version = "0.1.5", optional = true }
 [dev-dependencies]
 actix-server = { version = "1.0.0-alpha.3" }
 actix-connect = { version = "1.0.0-alpha.3", features=["openssl"] }
-actix-http-test = { version = "0.3.0-alpha.3", features=["openssl"] }
+actix-http-test = { version = "1.0.0-alpha.3", features=["openssl"] }
 actix-tls = { version = "1.0.0-alpha.3", features=["openssl"] }
 env_logger = "0.6"
 serde_derive = "1.0"

actix-http/src/client/connector.rs

@@ -88,7 +88,7 @@ impl Connector<(), ()> {
                 let mut config = ClientConfig::new();
                 config.set_protocols(&protos);
                 config.root_store.add_server_trust_anchors(
-                    &actix_connect::ssl::rustls::TLS_SERVER_ROOTS,
+                    &actix_tls::rustls::TLS_SERVER_ROOTS,
                 );
                 SslConnector::Rustls(Arc::new(config))
             }

actix-identity/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-identity"
-version = "0.2.0-alpha.1"
+version = "0.2.0-alpha.3"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Identity service for actix web framework."
 readme = "README.md"
@@ -17,14 +17,14 @@ name = "actix_identity"
 path = "src/lib.rs"
 
 [dependencies]
-actix-web = { version = "2.0.0-alpha.2", default-features = false, features = ["secure-cookies"] }
+actix-web = { version = "2.0.0-alpha.3", default-features = false, features = ["secure-cookies"] }
-actix-service = "1.0.0-alpha.2"
+actix-service = "1.0.0-alpha.3"
 futures = "0.3.1"
 serde = "1.0"
 serde_json = "1.0"
 time = "0.1.42"
 
 [dev-dependencies]
-actix-rt = "1.0.0-alpha.2"
+actix-rt = "1.0.0-alpha.3"
-actix-http = "0.3.0-alpha.2"
+actix-http = "1.0.0-alpha.3"
 bytes = "0.5.2"

actix-multipart/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-multipart"
-version = "0.2.0-alpha.2"
+version = "0.2.0-alpha.3"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Multipart support for actix web framework."
 readme = "README.md"
@@ -18,9 +18,9 @@ name = "actix_multipart"
 path = "src/lib.rs"
 
 [dependencies]
-actix-web = { version = "2.0.0-alpha.2", default-features = false }
+actix-web = { version = "2.0.0-alpha.3", default-features = false }
-actix-service = "1.0.0-alpha.2"
+actix-service = "1.0.0-alpha.3"
-actix-utils = "1.0.0-alpha.2"
+actix-utils = "1.0.0-alpha.3"
 bytes = "0.5.2"
 derive_more = "0.99.2"
 httparse = "1.3"
@@ -31,5 +31,5 @@ time = "0.1"
 twoway = "0.2"
 
 [dev-dependencies]
-actix-rt = "1.0.0-alpha.2"
+actix-rt = "1.0.0-alpha.3"
-actix-http = "0.3.0-alpha.2"
+actix-http = "1.0.0-alpha.3"

awc/CHANGES.md

@@ -1,5 +1,10 @@
 # Changes
 
+## [1.0.0-alpha.3]
+
+* Migrate to `std::future`
+
+
 ## [0.2.8] - 2019-11-06
 
 * Add support for setting query from Serialize type for client request.

awc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "awc"
-version = "0.3.0-alpha.3"
+version = "1.0.0-alpha.3"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix http client."
 readme = "README.md"
@@ -44,7 +44,7 @@ flate2-rust = ["actix-http/flate2-rust"]
 [dependencies]
 actix-codec = "0.2.0-alpha.3"
 actix-service = "1.0.0-alpha.3"
-actix-http = "0.3.0-alpha.3"
+actix-http = "1.0.0-alpha.3"
 actix-rt = "1.0.0-alpha.3"
 
 base64 = "0.11"
@@ -64,8 +64,8 @@ rust-tls = { version = "0.16.0", package="rustls", optional = true, features = [
 [dev-dependencies]
 actix-connect = { version = "1.0.0-alpha.3", features=["openssl"] }
 actix-web = { version = "2.0.0-alpha.3", features=["openssl"] }
-actix-http = { version = "0.3.0-alpha.3", features=["openssl"] }
+actix-http = { version = "1.0.0-alpha.3", features=["openssl"] }
-actix-http-test = { version = "0.3.0-alpha.3", features=["openssl"] }
+actix-http-test = { version = "1.0.0-alpha.3", features=["openssl"] }
 actix-utils = "1.0.0-alpha.3"
 actix-server = { version = "1.0.0-alpha.3" }
 actix-tls = { version = "1.0.0-alpha.3", features=["openssl", "rustls"] }

src/server.rs

@@ -516,13 +516,12 @@ where
     /// This methods panics if no socket address can be bound or an `Actix` system is not yet
     /// configured.
     ///
-    /// ```rust
+    /// ```rust,no_run
     /// use std::io;
     /// use actix_web::{web, App, HttpResponse, HttpServer};
     ///
     /// #[actix_rt::main]
     /// async fn main() -> io::Result<()> {
-    /// #   actix_rt::System::current().stop();
     ///     HttpServer::new(|| App::new().service(web::resource("/").to(|| HttpResponse::Ok())))
     ///         .bind("127.0.0.1:0")?
     ///         .start()

test-server/CHANGES.md

@@ -1,6 +1,13 @@
 # Changes
 
-## [0.2.5] - 2019-0917
+## [1.0.0-alpha.3] - 2019-12-07
+
+### Changed
+
+* Migrate to `std::future`
+
+
+## [0.2.5] - 2019-09-17
 
 ### Changed
 

test-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-http-test"
-version = "0.3.0-alpha.3"
+version = "1.0.0-alpha.3"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix http test server"
 readme = "README.md"
@@ -37,7 +37,7 @@ actix-utils = "1.0.0-alpha.3"
 actix-rt = "1.0.0-alpha.3"
 actix-server = "1.0.0-alpha.3"
 actix-testing = "1.0.0-alpha.3"
-awc = "0.3.0-alpha.3"
+awc = "1.0.0-alpha.3"
 
 base64 = "0.11"
 bytes = "0.5.2"
@@ -56,4 +56,4 @@ open-ssl = { version="0.10", package="openssl", optional = true }
 
 [dev-dependencies]
 actix-web = "2.0.0-alpha.3"
-actix-http = "0.3.0-alpha.3"
+actix-http = "1.0.0-alpha.3"