From 5da65b7b305c3b5fb981cb49d345da3f2296bb56 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Sun, 21 Feb 2021 15:40:45 +0600
Subject: [PATCH] update ntex

---
 ntex-cors/Cargo.toml      |  2 +-
 ntex-cors/src/lib.rs      | 17 ++++++++---------
 ntex-files/Cargo.toml     |  8 ++++----
 ntex-identity/Cargo.toml  |  4 ++--
 ntex-identity/src/lib.rs  |  3 ++-
 ntex-multipart/Cargo.toml |  6 +++---
 ntex-session/Cargo.toml   |  6 +++---
 ntex-session/src/lib.rs   |  3 ++-
 8 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/ntex-cors/Cargo.toml b/ntex-cors/Cargo.toml
index 08f376a7..cef45de3 100644
--- a/ntex-cors/Cargo.toml
+++ b/ntex-cors/Cargo.toml
@@ -16,6 +16,6 @@ name = "ntex_cors"
 path = "src/lib.rs"
 
 [dependencies]
-ntex = "0.1.24"
+ntex = "0.2.0-b.14"
 derive_more = "0.99.5"
 futures = "0.3.5"
\ No newline at end of file
diff --git a/ntex-cors/src/lib.rs b/ntex-cors/src/lib.rs
index cd1f12ae..edc73b46 100644
--- a/ntex-cors/src/lib.rs
+++ b/ntex-cors/src/lib.rs
@@ -494,10 +494,12 @@ impl Cors {
 
         if !slf.expose_hdrs.is_empty() {
             cors.expose_hdrs = Some(
-                slf.expose_hdrs
-                    .iter()
-                    .fold(String::new(), |s, v| format!("{}, {}", s, v.as_str()))[2..]
-                    .to_owned(),
+                HeaderValue::try_from(
+                    &slf.expose_hdrs
+                        .iter()
+                        .fold(String::new(), |s, v| format!("{}, {}", s, v.as_str()))[2..],
+                )
+                .unwrap(),
             );
         }
 
@@ -517,7 +519,7 @@ struct Inner {
     origins: AllOrSome<HashSet<String>>,
     origins_str: Option<HeaderValue>,
     headers: AllOrSome<HashSet<HeaderName>>,
-    expose_hdrs: Option<String>,
+    expose_hdrs: Option<HeaderValue>,
     max_age: Option<usize>,
     preflight: bool,
     send_wildcard: bool,
@@ -688,10 +690,7 @@ impl Inner {
         };
 
         if let Some(ref expose) = self.expose_hdrs {
-            headers.insert(
-                header::ACCESS_CONTROL_EXPOSE_HEADERS,
-                HeaderValue::try_from(expose.as_str()).unwrap(),
-            );
+            headers.insert(header::ACCESS_CONTROL_EXPOSE_HEADERS, expose.clone());
         }
         if self.supports_credentials {
             headers.insert(
diff --git a/ntex-files/Cargo.toml b/ntex-files/Cargo.toml
index a7e459c8..f923e6d6 100644
--- a/ntex-files/Cargo.toml
+++ b/ntex-files/Cargo.toml
@@ -18,10 +18,10 @@ name = "ntex_files"
 path = "src/lib.rs"
 
 [dependencies]
-ntex = "0.1.21"
+ntex = "0.2.0-b.14"
 bitflags = "1"
-bytes = "0.5.4"
-futures = "0.3.4"
+bytes = "0.5.6"
+futures = "0.3.12"
 derive_more = "0.99.5"
 hyperx = "1.0.0"
 log = "0.4"
@@ -31,4 +31,4 @@ percent-encoding = "2.1"
 v_htmlescape = "0.4"
 
 [dev-dependencies]
-ntex = { version = "0.1.7", features=["openssl", "compress"] }
+ntex = { version = "0.2.0-b.14", features=["openssl", "compress"] }
diff --git a/ntex-identity/Cargo.toml b/ntex-identity/Cargo.toml
index fc8dcb0d..9b8a4b7d 100644
--- a/ntex-identity/Cargo.toml
+++ b/ntex-identity/Cargo.toml
@@ -21,8 +21,8 @@ default = ["cookie-policy"]
 cookie-policy = ["cookie/secure", "ntex/cookie"]
 
 [dependencies]
-ntex = "0.1.21"
-futures = "0.3.4"
+ntex = "0.2.0-b.14"
+futures = "0.3.12"
 serde = "1.0"
 serde_json = "1.0"
 cookie = "0.14.2"
diff --git a/ntex-identity/src/lib.rs b/ntex-identity/src/lib.rs
index 52f19a9d..53d5d4f1 100644
--- a/ntex-identity/src/lib.rs
+++ b/ntex-identity/src/lib.rs
@@ -59,8 +59,9 @@ use time::Duration;
 
 use ntex::http::error::HttpError;
 use ntex::http::header::{self, HeaderValue};
-use ntex::http::{Extensions, HttpMessage, Payload};
+use ntex::http::{HttpMessage, Payload};
 use ntex::service::{Service, Transform};
+use ntex::util::Extensions;
 use ntex::web::dev::{WebRequest, WebResponse};
 use ntex::web::{DefaultError, ErrorRenderer, FromRequest, HttpRequest, WebResponseError};
 
diff --git a/ntex-multipart/Cargo.toml b/ntex-multipart/Cargo.toml
index d999ccdd..172d54a7 100644
--- a/ntex-multipart/Cargo.toml
+++ b/ntex-multipart/Cargo.toml
@@ -16,11 +16,11 @@ name = "ntex_multipart"
 path = "src/lib.rs"
 
 [dependencies]
-ntex = "0.1.21"
-bytes = "0.5.4"
+ntex = "0.2.0-b.14"
+bytes = "0.5.6"
 derive_more = "0.99.5"
 httparse = "1.3"
-futures = "0.3.4"
+futures = "0.3.12"
 log = "0.4"
 mime = "0.3"
 twoway = "0.2"
diff --git a/ntex-session/Cargo.toml b/ntex-session/Cargo.toml
index cee8a0c0..f9567d58 100644
--- a/ntex-session/Cargo.toml
+++ b/ntex-session/Cargo.toml
@@ -22,11 +22,11 @@ default = ["cookie-session"]
 cookie-session = ["cookie/secure", "ntex/cookie"]
 
 [dependencies]
-ntex = "0.1.21"
-bytes = "0.5.4"
+ntex = "0.2.0-b.14"
+bytes = "0.5.6"
 cookie = "0.14.2"
 derive_more = "0.99.5"
-futures = "0.3.4"
+futures = "0.3.12"
 serde = "1.0"
 serde_json = "1.0"
 time = { version = "0.2.5", default-features = false, features = ["std"] }
diff --git a/ntex-session/src/lib.rs b/ntex-session/src/lib.rs
index 9f19e043..4120cdbe 100644
--- a/ntex-session/src/lib.rs
+++ b/ntex-session/src/lib.rs
@@ -47,7 +47,8 @@ use std::convert::Infallible;
 use std::rc::Rc;
 
 use futures::future::{ok, Ready};
-use ntex::http::{Extensions, Payload, RequestHead};
+use ntex::http::{Payload, RequestHead};
+use ntex::util::Extensions;
 use ntex::web::dev::{WebRequest, WebResponse};
 use ntex::web::{Error, FromRequest, HttpRequest};
 use serde::de::DeserializeOwned;