Manually resolve bleeped conflict

cloudflare · Aug 29, 2024 · 1f01a87 · 1f01a87
1 parent d8f3ffa
commit 1f01a87
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/pingora-core/Cargo.toml b/pingora-core/Cargo.toml
@@ -78,7 +78,8 @@ hyper = "0.14"
 jemallocator = "0.5"
 
 [features]
-default = ["openssl"]
-openssl = ["pingora-openssl"]
-boringssl = ["pingora-boringssl"]
-patched_http1 = []
+default = ["openssl", "patched_http1"]
+openssl = ["pingora-openssl", "some_tls"]
+boringssl = ["pingora-boringssl", "some_tls"]
+patched_http1 = []
+some_tls = []