diff options
| author | Andy Caldwell <andrew.caldwell@metaswitch.com> | 2019-12-06 04:27:48 +0000 |
|---|---|---|
| committer | Doug Tangren <d.tangren@gmail.com> | 2019-12-05 23:27:48 -0500 |
| commit | 546753dc6d3215429e6f91c80abaa6599de332e5 (patch) | |
| tree | 7da7fc579f48a7e2211ff12d702d7ec6fea8ad29 | |
| parent | 85aac5427492fa1436bcde0a839326ec2c8998cb (diff) | |
Don't vendor OpenSSL except on Windows (#197)
* Don't vendor OpenSSL except on Windows
* Use a feature rather than guessing based on OS
| -rw-r--r-- | Cargo.toml | 5 | ||||
| -rw-r--r-- | src/transport.rs | 3 |
2 files changed, 4 insertions, 4 deletions
@@ -28,9 +28,7 @@ http = "0.1" hyper = "0.12" hyper-openssl = { version = "0.7", optional = true } hyperlocal = { version = "0.6", optional = true } -log = "0.4" -mime = "0.3" -openssl = { version = "0.10", optional = true, features = ["vendored"] } +openssl = { version = "0.10", optional = true } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" tar = "0.4" @@ -46,3 +44,4 @@ env_logger = "0.6" default = ["chrono", "unix-socket", "tls"] unix-socket = ["hyperlocal"] tls = ["openssl", "hyper-openssl"] +vendored-ssl = ["tls", "openssl/vendored"] diff --git a/src/transport.rs b/src/transport.rs index ce089fc..2887790 100644 --- a/src/transport.rs +++ b/src/transport.rs @@ -221,7 +221,8 @@ impl Transport { Transport::Tcp { .. } => (), #[cfg(feature = "tls")] Transport::EncryptedTcp { .. } => (), - _ => panic!("connection streaming is only supported over TCP"), + #[cfg(feature = "unix-socket")] + Transport::Unix { .. } => panic!("connection streaming is only supported over TCP"), }; let req = self |