From 1f01a87a7c9080696f0d1c834bf6503ac8492962 Mon Sep 17 00:00:00 2001 From: Kevin Guthrie Date: Fri, 23 Aug 2024 17:29:19 -0400 Subject: [PATCH] Manually resolve bleeped conflict --- pingora-core/Cargo.toml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pingora-core/Cargo.toml b/pingora-core/Cargo.toml index c5bce77e2..7d9e0da28 100644 --- 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 = [] \ No newline at end of file +default = ["openssl", "patched_http1"] +openssl = ["pingora-openssl", "some_tls"] +boringssl = ["pingora-boringssl", "some_tls"] +patched_http1 = [] +some_tls = [] \ No newline at end of file