From 9406613908ae47e9325c6b1de2394bd472066d09 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Wed, 25 Sep 2024 19:14:56 +0500
Subject: [PATCH] Disable default features for rustls (#429)

---
 ntex-net/CHANGES.md |  4 ++++
 ntex-net/Cargo.toml |  6 +++---
 ntex-tls/CHANGES.md |  4 ++++
 ntex-tls/Cargo.toml |  6 ++++--
 ntex/CHANGES.md     |  4 ++++
 ntex/Cargo.toml     | 10 +++++-----
 6 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/ntex-net/CHANGES.md b/ntex-net/CHANGES.md
index 6de853549..682d9160c 100644
--- a/ntex-net/CHANGES.md
+++ b/ntex-net/CHANGES.md
@@ -1,5 +1,9 @@
 # Changes
 
+## [2.4.0] - 2024-09-25
+
+* Update to glommio v0.9
+
 ## [2.3.0] - 2024-09-24
 
 * Update to compio v0.12
diff --git a/ntex-net/Cargo.toml b/ntex-net/Cargo.toml
index b8156b0be..d030e5183 100644
--- a/ntex-net/Cargo.toml
+++ b/ntex-net/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ntex-net"
-version = "2.3.0"
+version = "2.4.0"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "ntexwork utils for ntex framework"
 keywords = ["network", "framework", "async", "futures"]
@@ -35,12 +35,12 @@ ntex-service = "3"
 ntex-bytes = "0.1"
 ntex-http = "0.1"
 ntex-io = "2.5"
-ntex-rt = "0.4.17"
+ntex-rt = "0.4.18"
 ntex-util = "2"
 
 ntex-tokio = { version = "0.5.2", optional = true }
 ntex-compio = { version = "0.2.0", optional = true }
-ntex-glommio = { version = "0.5.1", optional = true }
+ntex-glommio = { version = "0.5.2", optional = true }
 ntex-async-std = { version = "0.5.1", optional = true }
 
 log = "0.4"
diff --git a/ntex-tls/CHANGES.md b/ntex-tls/CHANGES.md
index bbae1b991..042aa7717 100644
--- a/ntex-tls/CHANGES.md
+++ b/ntex-tls/CHANGES.md
@@ -1,5 +1,9 @@
 # Changes
 
+## [2.2.0] - 2024-09-25
+
+* Disable default features for rustls
+
 ## [2.1.0] - 2024-08-28
 
 * Update io api usage
diff --git a/ntex-tls/Cargo.toml b/ntex-tls/Cargo.toml
index 308d2f018..b033e3291 100644
--- a/ntex-tls/Cargo.toml
+++ b/ntex-tls/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ntex-tls"
-version = "2.1.0"
+version = "2.2.0"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "An implementation of SSL streams for ntex backed by OpenSSL"
 keywords = ["network", "framework", "async", "futures"]
@@ -23,6 +23,7 @@ openssl = ["tls_openssl"]
 
 # rustls support
 rustls = ["tls_rust"]
+rustls-ring = ["tls_rust", "tls_rust/ring", "tls_rust/std"]
 
 [dependencies]
 ntex-bytes = "0.1"
@@ -37,10 +38,11 @@ log = "0.4"
 tls_openssl = { version = "0.10", package = "openssl", optional = true }
 
 # rustls
-tls_rust = { version = "0.23", package = "rustls", optional = true }
+tls_rust = { version = "0.23", package = "rustls", default-features = false, optional = true }
 
 [dev-dependencies]
 ntex = { version = "2", features = ["openssl", "rustls"] }
 env_logger = "0.11"
 rustls-pemfile = "2"
 webpki-roots = "0.26"
+tls_rust = { version = "0.23", package = "rustls", features = ["ring", "std"], default-features = false }
diff --git a/ntex/CHANGES.md b/ntex/CHANGES.md
index 872eb90bc..a1cef06b4 100644
--- a/ntex/CHANGES.md
+++ b/ntex/CHANGES.md
@@ -1,5 +1,9 @@
 # Changes
 
+## [2.6.0] - 2024-09-25
+
+* Disable default features for rustls
+
 ## [2.5.0] - 2024-09-24
 
 * Allow to set io tag for web server
diff --git a/ntex/Cargo.toml b/ntex/Cargo.toml
index e10abc08c..3ea843b86 100644
--- a/ntex/Cargo.toml
+++ b/ntex/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ntex"
-version = "2.5.0"
+version = "2.6.0"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "Framework for composable network services"
 readme = "README.md"
@@ -70,9 +70,9 @@ ntex-util = "2"
 ntex-bytes = "0.1.27"
 ntex-server = "2.4"
 ntex-h2 = "1.1"
-ntex-rt = "0.4.17"
+ntex-rt = "0.4.18"
 ntex-io = "2.5"
-ntex-net = "2.3"
+ntex-net = "2.4"
 ntex-tls = "2.1"
 
 base64 = "0.22"
@@ -104,7 +104,7 @@ coo-kie = { version = "0.18", package = "cookie", optional = true }
 tls-openssl = { version = "0.10", package = "openssl", optional = true }
 
 # rustls
-tls-rustls = { version = "0.23", package = "rustls", optional = true }
+tls-rustls = { version = "0.23", package = "rustls", optional = true, default-features = false }
 webpki-roots = { version = "0.26", optional = true }
 
 # compression
@@ -117,6 +117,6 @@ rand = "0.8"
 time = "0.3"
 futures-util = "0.3"
 tls-openssl = { version = "0.10", package = "openssl" }
-tls-rustls = { version = "0.23", package = "rustls" }
+tls-rustls = { version = "0.23", package = "rustls", features = ["ring", "std"], default-features = false }
 rustls-pemfile = "2"
 webpki-roots = "0.26"