From a20b9fd354f530ac689292bd77ac2f410b939707 Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Fri, 29 Mar 2019 22:06:14 -0700 Subject: [PATCH] prepare aplha2 release --- CHANGES.md | 6 ++++++ Cargo.toml | 10 +++++----- actix-files/Cargo.toml | 11 ++++------- actix-http/Cargo.toml | 4 +--- actix-http/src/response.rs | 35 +++++++++++++++-------------------- actix-session/CHANGES.md | 6 ++++++ actix-session/Cargo.toml | 7 +++---- actix-web-actors/CHANGES.md | 4 ++++ actix-web-actors/Cargo.toml | 11 ++++------- actix-web-codegen/Cargo.toml | 9 +++------ awc/Cargo.toml | 10 +++++----- test-server/CHANGES.md | 7 +++++++ test-server/Cargo.toml | 9 ++------- 13 files changed, 65 insertions(+), 64 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 47b0f9875..e18635916 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,8 +2,14 @@ ## [1.0.0-alpha.2] - 2019-03-29 +### Added + +* rustls support + ### Changed +* use forked cookie + * multipart::Field renamed to MultipartField ## [1.0.0-alpha.1] - 2019-03-28 diff --git a/Cargo.toml b/Cargo.toml index 1bd089f02..f7f285091 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-web" -version = "1.0.0-alpha.1" +version = "1.0.0-alpha.2" authors = ["Nikolay Kim "] description = "Actix web is a simple, pragmatic and extremely fast web framework for Rust." readme = "README.md" @@ -71,11 +71,11 @@ actix-utils = "0.3.4" actix-router = "0.1.0" actix-rt = "0.2.2" actix-web-codegen = "0.1.0-alpha.1" -actix-http = { path = "actix-http", features=["fail"] } +actix-http = { version = "0.1.0-alpha.2", features=["fail"] } actix-server = "0.4.1" actix-server-config = "0.1.0" actix-threadpool = "0.1.0" -awc = { path = "awc", optional = true } +awc = { version = "0.1.0-alpha.2", optional = true } bytes = "0.4" derive_more = "0.14" @@ -100,8 +100,8 @@ openssl = { version="0.10", optional = true } rustls = { version = "^0.15", optional = true } [dev-dependencies] -actix-http = { path = "actix-http", features=["ssl", "brotli", "flate2-zlib"] } -actix-http-test = { path = "test-server", features=["ssl"] } +actix-http = { version = "0.1.0-alpha.2", features=["ssl", "brotli", "flate2-zlib"] } +actix-http-test = { version = "0.1.0-alpha.2", features=["ssl"] } rand = "0.6" env_logger = "0.6" serde_derive = "1.0" diff --git a/actix-files/Cargo.toml b/actix-files/Cargo.toml index 058a19987..3f1bad69e 100644 --- a/actix-files/Cargo.toml +++ b/actix-files/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-files" -version = "0.1.0-alpha.1" +version = "0.1.0-alpha.2" authors = ["Nikolay Kim "] description = "Static files support for actix web." readme = "README.md" @@ -18,10 +18,8 @@ name = "actix_files" path = "src/lib.rs" [dependencies] -#actix-web = "1.0.0-alpha.1" -actix-web = { path = ".." } -actix-service = "0.3.3" - +actix-web = "1.0.0-alpha.2" +actix-service = "0.3.4" bitflags = "1" bytes = "0.4" futures = "0.1.25" @@ -33,5 +31,4 @@ percent-encoding = "1.0" v_htmlescape = "0.4" [dev-dependencies] -#actix-web = { version = "1.0.0-alpha.1", features=["ssl"] } -actix-web = { path = "..", features=["ssl"] } +actix-web = { version = "1.0.0-alpha.2", features=["ssl"] } diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml index e9bb5d9bb..2de624b7c 100644 --- a/actix-http/Cargo.toml +++ b/actix-http/Cargo.toml @@ -100,9 +100,7 @@ openssl = { version="0.10", optional = true } actix-rt = "0.2.2" actix-server = { version = "0.4.1", features=["ssl"] } actix-connect = { version = "0.1.0", features=["ssl"] } -#actix-http-test = { version = "0.1.0-alpha.1", features=["ssl"] } -actix-http-test = { path = "../test-server", features=["ssl"] } - +actix-http-test = { version = "0.1.0-alpha.2", features=["ssl"] } env_logger = "0.6" serde_derive = "1.0" openssl = { version="0.10" } diff --git a/actix-http/src/response.rs b/actix-http/src/response.rs index a6e8f613c..88eb7dccb 100644 --- a/actix-http/src/response.rs +++ b/actix-http/src/response.rs @@ -333,11 +333,10 @@ impl ResponseBuilder { /// Set a header. /// - /// ```rust,ignore - /// # extern crate actix_web; - /// use actix_web::{http, Request, Response, Result}; + /// ```rust + /// use actix_http::{http, Request, Response, Result}; /// - /// fn index(req: HttpRequest) -> Result { + /// fn index(req: Request) -> Result { /// Ok(Response::Ok() /// .set(http::header::IfModifiedSince( /// "Sun, 07 Nov 1994 08:48:37 GMT".parse()?, @@ -361,11 +360,10 @@ impl ResponseBuilder { /// Append a header to existing headers. /// - /// ```rust,ignore - /// # extern crate actix_web; - /// use actix_web::{http, Request, Response}; + /// ```rust + /// use actix_http::{http, Request, Response}; /// - /// fn index(req: HttpRequest) -> Response { + /// fn index(req: Request) -> Response { /// Response::Ok() /// .header("X-TEST", "value") /// .header(http::header::CONTENT_TYPE, "application/json") @@ -394,11 +392,10 @@ impl ResponseBuilder { /// Set a header. /// - /// ```rust,ignore - /// # extern crate actix_web; - /// use actix_web::{http, Request, Response}; + /// ```rust + /// use actix_http::{http, Request, Response}; /// - /// fn index(req: HttpRequest) -> Response { + /// fn index(req: Request) -> Response { /// Response::Ok() /// .set_header("X-TEST", "value") /// .set_header(http::header::CONTENT_TYPE, "application/json") @@ -500,11 +497,10 @@ impl ResponseBuilder { /// Set a cookie /// - /// ```rust,ignore - /// # extern crate actix_web; - /// use actix_web::{http, HttpRequest, Response, Result}; + /// ```rust + /// use actix_http::{http, Request, Response}; /// - /// fn index(req: HttpRequest) -> Response { + /// fn index(req: Request) -> Response { /// Response::Ok() /// .cookie( /// http::Cookie::build("name", "value") @@ -530,11 +526,10 @@ impl ResponseBuilder { /// Remove cookie /// - /// ```rust,ignore - /// # extern crate actix_web; - /// use actix_web::{http, HttpRequest, Response, Result}; + /// ```rust + /// use actix_http::{http, Request, Response, HttpMessage}; /// - /// fn index(req: &HttpRequest) -> Response { + /// fn index(req: Request) -> Response { /// let mut builder = Response::Ok(); /// /// if let Some(ref cookie) = req.cookie("name") { diff --git a/actix-session/CHANGES.md b/actix-session/CHANGES.md index 95ec1c35f..3cd156092 100644 --- a/actix-session/CHANGES.md +++ b/actix-session/CHANGES.md @@ -1,5 +1,11 @@ # Changes +## [0.1.0-alpha.2] - 2019-03-29 + +* Update actix-web + +* Use new feature name for secure cookies + ## [0.1.0-alpha.1] - 2019-03-28 * Initial impl diff --git a/actix-session/Cargo.toml b/actix-session/Cargo.toml index 6569286cb..e39dc7140 100644 --- a/actix-session/Cargo.toml +++ b/actix-session/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-session" -version = "0.1.0-alpha.1" +version = "0.1.0-alpha.2" authors = ["Nikolay Kim "] description = "Session for actix web framework." readme = "README.md" @@ -24,9 +24,8 @@ default = ["cookie-session"] cookie-session = ["actix-web/secure-cookies"] [dependencies] -#actix-web = "1.0.0-alpha.1" -actix-web = { path = ".." } -actix-service = "0.3.3" +actix-web = "1.0.0-alpha.2" +actix-service = "0.3.4" bytes = "0.4" derive_more = "0.14" futures = "0.1.25" diff --git a/actix-web-actors/CHANGES.md b/actix-web-actors/CHANGES.md index 95ec1c35f..9b1427980 100644 --- a/actix-web-actors/CHANGES.md +++ b/actix-web-actors/CHANGES.md @@ -1,5 +1,9 @@ # Changes +## [0.1.0-alpha.2] - 2019-03-29 + +* Update actix-http and actix-web + ## [0.1.0-alpha.1] - 2019-03-28 * Initial impl diff --git a/actix-web-actors/Cargo.toml b/actix-web-actors/Cargo.toml index 55cfd47d7..759d6fc31 100644 --- a/actix-web-actors/Cargo.toml +++ b/actix-web-actors/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-web-actors" -version = "1.0.0-alpha.1" +version = "1.0.0-alpha.2" authors = ["Nikolay Kim "] description = "Actix actors support for actix web framework." readme = "README.md" @@ -19,15 +19,12 @@ path = "src/lib.rs" [dependencies] actix = "0.8.0-alpha.2" -#actix-web = "1.0.0-alpha.1" -#actix-http = "0.1.0-alpha.1" -actix-web = { path=".." } -actix-http = { path="../actix-http" } +actix-web = "1.0.0-alpha.2" +actix-http = "0.1.0-alpha.2" actix-codec = "0.1.2" bytes = "0.4" futures = "0.1.25" [dev-dependencies] env_logger = "0.6" -#actix-http-test = { version = "0.1.0-alpha.1", features=["ssl"] } -actix-http-test = { path = "../test-server", features=["ssl"] } +actix-http-test = { version = "0.1.0-alpha.2", features=["ssl"] } diff --git a/actix-web-codegen/Cargo.toml b/actix-web-codegen/Cargo.toml index c3d88883f..da2640760 100644 --- a/actix-web-codegen/Cargo.toml +++ b/actix-web-codegen/Cargo.toml @@ -16,9 +16,6 @@ quote = "0.6" syn = { version = "0.15", features = ["full", "parsing"] } [dev-dependencies] -#actix-web = { version = "1.0.0-alpha.1" } -#actix-http = { version = "0.1.0-alpha.1", features=["ssl"] } -#actix-http-test = { version = "0.1.0-alpha.1", features=["ssl"] } -actix-web = { path = ".." } -actix-http = { path = "../actix-http", features=["ssl"] } -actix-http-test = { path = "../test-server", features=["ssl"] } +actix-web = { version = "1.0.0-alpha.2" } +actix-http = { version = "0.1.0-alpha.2", features=["ssl"] } +actix-http-test = { version = "0.1.0-alpha.2", features=["ssl"] } \ No newline at end of file diff --git a/awc/Cargo.toml b/awc/Cargo.toml index 148bf97de..c2cc9e7f0 100644 --- a/awc/Cargo.toml +++ b/awc/Cargo.toml @@ -38,7 +38,7 @@ flate2-rust = ["actix-http/flate2-rust"] [dependencies] actix-codec = "0.1.1" actix-service = "0.3.4" -actix-http = { path = "../actix-http" } +actix-http = "0.1.0-alpa.2" base64 = "0.10.1" bytes = "0.4" derive_more = "0.14" @@ -54,11 +54,11 @@ openssl = { version="0.10", optional = true } [dev-dependencies] actix-rt = "0.2.2" -actix-web = { path = "..", features=["ssl"] } -actix-http = { path = "../actix-http", features=["ssl"] } -actix-http-test = { path = "../test-server", features=["ssl"] } +actix-web = { version = "1.0.0-alpha.2", features=["ssl"] } +actix-http = { version = "0.1.0-alpa.2", features=["ssl"] } +actix-http-test = { version = "0.1.0-alpha.2", features=["ssl"] } actix-utils = "0.3.4" -actix-server = { version = "0.4.0", features=["ssl"] } +actix-server = { version = "0.4.1", features=["ssl"] } brotli2 = { version="0.3.2" } flate2 = { version="1.0.2" } env_logger = "0.6" diff --git a/test-server/CHANGES.md b/test-server/CHANGES.md index 95ec1c35f..cac5a2afe 100644 --- a/test-server/CHANGES.md +++ b/test-server/CHANGES.md @@ -1,5 +1,12 @@ # Changes +## [0.1.0-alpha.2] - 2019-03-29 + +* Added TestServerRuntime::load_body() method + +* Update actix-http and awc libraries + + ## [0.1.0-alpha.1] - 2019-03-28 * Initial impl diff --git a/test-server/Cargo.toml b/test-server/Cargo.toml index 97947230f..838f2d8d2 100644 --- a/test-server/Cargo.toml +++ b/test-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-http-test" -version = "0.1.0-alpha.1" +version = "0.1.0-alpha.2" authors = ["Nikolay Kim "] description = "Actix http test server" readme = "README.md" @@ -35,7 +35,7 @@ actix-rt = "0.2.1" actix-service = "0.3.4" actix-server = "0.4.0" actix-utils = "0.3.4" -awc = { path = "../awc" } +awc = "0.1.0-alpha.2" base64 = "0.10" bytes = "0.4" @@ -52,9 +52,4 @@ serde_urlencoded = "0.5.3" time = "0.1" tokio-tcp = "0.1" tokio-timer = "0.2" - openssl = { version="0.10", optional = true } - -[dev-dependencies] -actix-web = { path = ".." } -actix-http = { path = "../actix-http" }