From 1f2b15397df6d19e475d5c5bb6d310fa521afcce Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Fri, 12 Apr 2019 14:00:45 -0700
Subject: [PATCH] prepare alpha5 release

---
 CHANGES.md                   |  6 ++++++
 Cargo.toml                   | 17 ++++++-----------
 actix-files/Cargo.toml       |  4 ++--
 actix-framed/Cargo.toml      |  6 +++---
 actix-framed/changes.md      |  5 +++++
 actix-http/CHANGES.md        |  2 +-
 actix-http/Cargo.toml        | 14 +++++++-------
 actix-session/Cargo.toml     |  4 ++--
 actix-web-actors/Cargo.toml  |  6 +++---
 actix-web-codegen/Cargo.toml |  6 +++---
 awc/CHANGES.md               |  2 +-
 awc/Cargo.toml               | 12 ++++++------
 src/lib.rs                   |  1 -
 src/test.rs                  |  2 ++
 test-server/Cargo.toml       | 16 ++++++++--------
 15 files changed, 55 insertions(+), 48 deletions(-)
 create mode 100644 actix-framed/changes.md

diff --git a/CHANGES.md b/CHANGES.md
index 162f410f..bf60787f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,9 +1,15 @@
 # Changes
 
+## [1.0.0-alpha.5] - 2019-04-12
+
 ### Added
 
 * Added async io `TestBuffer` for testing.
 
+### Deleted
+
+* Removed native-tls support
+
 
 ## [1.0.0-alpha.4] - 2019-04-08
 
diff --git a/Cargo.toml b/Cargo.toml
index 609b2ff3..442914f0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-web"
-version = "1.0.0-alpha.4"
+version = "1.0.0-alpha.5"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix web is a simple, pragmatic and extremely fast web framework for Rust."
 readme = "README.md"
@@ -38,7 +38,7 @@ members = [
 ]
 
 [package.metadata.docs.rs]
-features = ["ssl", "tls", "brotli", "flate2-zlib", "secure-cookies", "client", "rust-tls"]
+features = ["ssl", "brotli", "flate2-zlib", "secure-cookies", "client", "rust-tls"]
 
 [features]
 default = ["brotli", "flate2-zlib", "secure-cookies", "client"]
@@ -58,9 +58,6 @@ flate2-rust = ["actix-http/flate2-rust"]
 # sessions feature, session require "ring" crate and c compiler
 secure-cookies = ["actix-http/secure-cookies"]
 
-# tls
-tls = ["native-tls", "actix-server/ssl"]
-
 # openssl
 ssl = ["openssl", "actix-server/ssl", "awc/ssl"]
 
@@ -74,11 +71,11 @@ actix-utils = "0.3.4"
 actix-router = "0.1.2"
 actix-rt = "0.2.2"
 actix-web-codegen = "0.1.0-alpha.1"
-actix-http = { version = "0.1.0-alpha.4", features=["fail"] }
+actix-http = { version = "0.1.0-alpha.5", features=["fail"] }
 actix-server = "0.4.2"
 actix-server-config = "0.1.0"
 actix-threadpool = "0.1.0"
-awc = { version = "0.1.0-alpha.4", optional = true }
+awc = { version = "0.1.0-alpha.5", optional = true }
 
 bytes = "0.4"
 derive_more = "0.14"
@@ -92,17 +89,16 @@ parking_lot = "0.7"
 regex = "1.0"
 serde = { version = "1.0", features=["derive"] }
 serde_json = "1.0"
-serde_urlencoded = "^0.5.3"
+serde_urlencoded = "0.5.3"
 time = "0.1"
 url = { version="1.7", features=["query_encoding"] }
 
 # ssl support
-native-tls = { version="0.2", optional = true }
 openssl = { version="0.10", optional = true }
 rustls = { version = "^0.15", optional = true }
 
 [dev-dependencies]
-actix-http = { version = "0.1.0-alpha.4", features=["ssl", "brotli", "flate2-zlib"] }
+actix-http = { version = "0.1.0-alpha.5", features=["ssl", "brotli", "flate2-zlib"] }
 actix-http-test = { version = "0.1.0-alpha.3", features=["ssl"] }
 rand = "0.6"
 env_logger = "0.6"
@@ -117,7 +113,6 @@ opt-level = 3
 codegen-units = 1
 
 [patch.crates-io]
-actix = { git = "https://github.com/actix/actix.git" }
 actix-web = { path = "." }
 actix-http = { path = "actix-http" }
 actix-http-test = { path = "test-server" }
diff --git a/actix-files/Cargo.toml b/actix-files/Cargo.toml
index e017b132..6cc9c711 100644
--- a/actix-files/Cargo.toml
+++ b/actix-files/Cargo.toml
@@ -18,7 +18,7 @@ name = "actix_files"
 path = "src/lib.rs"
 
 [dependencies]
-actix-web = "1.0.0-alpha.4"
+actix-web = "1.0.0-alpha.5"
 actix-service = "0.3.4"
 bitflags = "1"
 bytes = "0.4"
@@ -31,4 +31,4 @@ percent-encoding = "1.0"
 v_htmlescape = "0.4"
 
 [dev-dependencies]
-actix-web = { version = "1.0.0-alpha.4", features=["ssl"] }
+actix-web = { version = "1.0.0-alpha.5", features=["ssl"] }
diff --git a/actix-framed/Cargo.toml b/actix-framed/Cargo.toml
index bbd7dd69..ba433e17 100644
--- a/actix-framed/Cargo.toml
+++ b/actix-framed/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-framed"
-version = "0.1.0"
+version = "0.1.0-alpha.1"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix framed app server"
 readme = "README.md"
@@ -25,7 +25,7 @@ actix-service = "0.3.6"
 actix-utils = "0.3.4"
 actix-router = "0.1.2"
 actix-rt = "0.2.2"
-actix-http = { path = "../actix-http" }
+actix-http = "0.1.0-alpha.5"
 
 bytes = "0.4"
 futures = "0.1.25"
@@ -33,5 +33,5 @@ log = "0.4"
 
 [dev-dependencies]
 actix-server = { version = "0.4.1", features=["ssl"] }
-actix-connect = { version = "0.1.0", features=["ssl"] }
+actix-connect = { version = "0.1.4", features=["ssl"] }
 actix-http-test = { version = "0.1.0-alpha.3", features=["ssl"] }
diff --git a/actix-framed/changes.md b/actix-framed/changes.md
new file mode 100644
index 00000000..125e22bc
--- /dev/null
+++ b/actix-framed/changes.md
@@ -0,0 +1,5 @@
+# Changes
+
+## [0.1.0-alpha.1] - 2019-04-12
+
+* Initial release
diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md
index ae9bb81c..98078d5b 100644
--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@@ -1,6 +1,6 @@
 # Changes
 
-## [0.1.0-alpha.5] - 2019-04-xx
+## [0.1.0-alpha.5] - 2019-04-12
 
 ### Added
 
diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml
index f0ff2058..cf82a733 100644
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-http"
-version = "0.1.0-alpha.4"
+version = "0.1.0-alpha.5"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix http primitives"
 readme = "README.md"
@@ -60,9 +60,9 @@ derive_more = "0.14"
 either = "1.5.2"
 encoding = "0.2"
 futures = "0.1"
-hashbrown = "0.1.8"
+hashbrown = "0.2.0"
 h2 = "0.1.16"
-http = "0.1.16"
+http = "0.1.17"
 httparse = "1.3"
 indexmap = "1.0"
 lazy_static = "1.0"
@@ -81,14 +81,14 @@ time = "0.1"
 tokio-tcp = "0.1.3"
 tokio-timer = "0.2"
 tokio-current-thread = "0.1"
-trust-dns-resolver = { version="0.11.0-alpha.2", default-features = false }
+trust-dns-resolver = { version="0.11.0-alpha.3", default-features = false }
 
 # for secure cookie
 ring = { version = "0.14.6", optional = true }
 
 # compression
-brotli2 = { version="^0.3.2", optional = true }
-flate2 = { version="^1.0.2", optional = true, default-features = false }
+brotli2 = { version="0.3.2", optional = true }
+flate2 = { version="1.0.7", optional = true, default-features = false }
 
 # optional deps
 failure = { version = "0.1.5", optional = true }
@@ -97,7 +97,7 @@ openssl = { version="0.10", optional = true }
 [dev-dependencies]
 actix-rt = "0.2.2"
 actix-server = { version = "0.4.1", features=["ssl"] }
-actix-connect = { version = "0.1.0", features=["ssl"] }
+actix-connect = { version = "0.1.4", features=["ssl"] }
 actix-http-test = { version = "0.1.0-alpha.3", features=["ssl"] }
 env_logger = "0.6"
 serde_derive = "1.0"
diff --git a/actix-session/Cargo.toml b/actix-session/Cargo.toml
index 00a4c524..9f1a9709 100644
--- a/actix-session/Cargo.toml
+++ b/actix-session/Cargo.toml
@@ -24,12 +24,12 @@ default = ["cookie-session"]
 cookie-session = ["actix-web/secure-cookies"]
 
 [dependencies]
-actix-web = "1.0.0-alpha.4"
+actix-web = "1.0.0-alpha.5"
 actix-service = "0.3.4"
 bytes = "0.4"
 derive_more = "0.14"
 futures = "0.1.25"
-hashbrown = "0.1.8"
+hashbrown = "0.2.0"
 serde = "1.0"
 serde_json = "1.0"
 time = "0.1"
diff --git a/actix-web-actors/Cargo.toml b/actix-web-actors/Cargo.toml
index 598d3945..084598a1 100644
--- a/actix-web-actors/Cargo.toml
+++ b/actix-web-actors/Cargo.toml
@@ -18,9 +18,9 @@ name = "actix_web_actors"
 path = "src/lib.rs"
 
 [dependencies]
-actix = "0.8.0-alpha.2"
-actix-web = "1.0.0-alpha.3"
-actix-http = "0.1.0-alpha.3"
+actix = "0.8.0-alpha.3"
+actix-web = "1.0.0-alpha.5"
+actix-http = "0.1.0-alpha.5"
 actix-codec = "0.1.2"
 bytes = "0.4"
 futures = "0.1.25"
diff --git a/actix-web-codegen/Cargo.toml b/actix-web-codegen/Cargo.toml
index 4d8c0910..f4027fbd 100644
--- a/actix-web-codegen/Cargo.toml
+++ b/actix-web-codegen/Cargo.toml
@@ -16,7 +16,7 @@ quote = "0.6"
 syn = { version = "0.15", features = ["full", "parsing"] }
 
 [dev-dependencies]
-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"] }
+actix-web = { version = "1.0.0-alpha.5" }
+actix-http = { version = "0.1.0-alpha.5", features=["ssl"] }
+actix-http-test = { version = "0.1.0-alpha.3", features=["ssl"] }
 futures = { version = "0.1" }
diff --git a/awc/CHANGES.md b/awc/CHANGES.md
index 4eeed7a1..4558867f 100644
--- a/awc/CHANGES.md
+++ b/awc/CHANGES.md
@@ -1,6 +1,6 @@
 # Changes
 
-## [0.1.0-alpha.5] - 2019-04-xx
+## [0.1.0-alpha.5] - 2019-04-12
 
 ### Changed
 
diff --git a/awc/Cargo.toml b/awc/Cargo.toml
index 17a5d18f..bddf63b8 100644
--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "awc"
-version = "0.1.0-alpha.4"
+version = "0.1.0-alpha.5"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix http client."
 readme = "README.md"
@@ -36,9 +36,9 @@ flate2-zlib = ["actix-http/flate2-zlib"]
 flate2-rust = ["actix-http/flate2-rust"]
 
 [dependencies]
-actix-codec = "0.1.1"
-actix-service = "0.3.4"
-actix-http = "0.1.0-alpha.4"
+actix-codec = "0.1.2"
+actix-service = "0.3.6"
+actix-http = "0.1.0-alpha.5"
 base64 = "0.10.1"
 bytes = "0.4"
 derive_more = "0.14"
@@ -55,8 +55,8 @@ openssl = { version="0.10", optional = true }
 
 [dev-dependencies]
 actix-rt = "0.2.2"
-actix-web = { version = "1.0.0-alpha.4", features=["ssl"] }
-actix-http = { version = "0.1.0-alpha.4", features=["ssl"] }
+actix-web = { version = "1.0.0-alpha.5", features=["ssl"] }
+actix-http = { version = "0.1.0-alpha.5", features=["ssl"] }
 actix-http-test = { version = "0.1.0-alpha.3", features=["ssl"] }
 actix-utils = "0.3.4"
 actix-server = { version = "0.4.1", features=["ssl"] }
diff --git a/src/lib.rs b/src/lib.rs
index bebf6ef3..f0600c6c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -67,7 +67,6 @@
 //! ## Package feature
 //!
 //! * `client` - enables http client
-//! * `tls` - enables ssl support via `native-tls` crate
 //! * `ssl` - enables ssl support via `openssl` crate, supports `http/2`
 //! * `rust-tls` - enables ssl support via `rustls` crate, supports `http/2`
 //! * `secure-cookies` - enables secure cookies support, includes `ring` crate as
diff --git a/src/test.rs b/src/test.rs
index affd80bb..f52aefc4 100644
--- a/src/test.rs
+++ b/src/test.rs
@@ -14,6 +14,8 @@ use actix_service::{FnService, IntoNewService, NewService, Service};
 use bytes::Bytes;
 use futures::future::{lazy, Future};
 
+pub use actix_http::test::TestBuffer;
+
 use crate::config::{AppConfig, AppConfigInner};
 use crate::data::RouteData;
 use crate::dev::{Body, Payload};
diff --git a/test-server/Cargo.toml b/test-server/Cargo.toml
index fefcb518..873eaea8 100644
--- a/test-server/Cargo.toml
+++ b/test-server/Cargo.toml
@@ -30,12 +30,12 @@ default = []
 ssl = ["openssl", "actix-server/ssl", "awc/ssl"]
 
 [dependencies]
-actix-codec = "0.1.1"
-actix-rt = "0.2.1"
-actix-service = "0.3.4"
-actix-server = "0.4.0"
-actix-utils = "0.3.4"
-awc = "0.1.0-alpha.3"
+actix-codec = "0.1.2"
+actix-rt = "0.2.2"
+actix-service = "0.3.6"
+actix-server = "0.4.1"
+actix-utils = "0.3.5"
+awc = "0.1.0-alpha.5"
 
 base64 = "0.10"
 bytes = "0.4"
@@ -55,5 +55,5 @@ tokio-timer = "0.2"
 openssl = { version="0.10", optional = true }
 
 [dev-dependencies]
-actix-web = "1.0.0-alpha.3"
-actix-http = "0.1.0-alpha.3"
+actix-web = "1.0.0-alpha.5"
+actix-http = "0.1.0-alpha.5"