Revert "Use reqwest rustls-tls"

This reverts commit 17c8aa7.
getzola · Feb 16, 2023 · bb17100 · bb17100
1 parent a56e424
commit bb17100
Show file tree

Hide file tree

Showing 4 changed files with 160 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,7 +30,6 @@ This will error if 2 values are set
 - Enable locale date formatting for the Tera `date` filter
 - Cachebust fingerprint is now only 20 chars long
 - Add `text` alias for plain text highlighting (before, only `txt` was used)
-- Switch reqwest TLS backend to rustls-tls
 
 
 ## 0.16.1 (2022-08-14)

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -48,6 +48,9 @@ libs = { path = "components/libs" }
 same-file = "1"
 
 [features]
+default = ["rust-tls"]
+rust-tls = ["libs/rust-tls"]
+native-tls = ["libs/native-tls"]
 indexing-zh = ["libs/indexing-zh"]
 indexing-ja = ["libs/indexing-ja"]
 

diff --git a/components/libs/Cargo.toml b/components/libs/Cargo.toml
@@ -26,7 +26,7 @@ quickxml_to_serde = "0.5"
 rayon = "1"
 regex = "1"
 relative-path = "1"
-reqwest = { version = "0.11", default-features = false, features = ["blocking", "rustls-tls"] }
+reqwest = { version = "0.11", default-features = false, features = ["blocking"] }
 grass = {version = "0.12.1", default-features = false, features = ["random"]}
 serde_json = "1"
 serde_yaml = "0.9"
@@ -46,5 +46,9 @@ webp = "0.2"
 
 
 [features]
+# TODO: fix me, it doesn't pick up the reqwuest feature if not set as default
+default = ["rust-tls"]
+rust-tls = ["reqwest/rustls-tls"]
+native-tls = ["reqwest/default-tls"]
 indexing-zh = ["elasticlunr-rs/zh"]
 indexing-ja = ["elasticlunr-rs/ja"]