diff options
| author | Zeyla Hellyer <[email protected]> | 2017-06-07 15:01:47 -0700 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2017-06-07 15:01:47 -0700 |
| commit | 8f8a05996c5b47ec9401aabb517d96ed2af5c36b (patch) | |
| tree | ab48c3b558c396f4f6d12c98a466074f97f17acf /Cargo.toml | |
| parent | Ws read/write timeout after 90s (diff) | |
| download | serenity-8f8a05996c5b47ec9401aabb517d96ed2af5c36b.tar.xz serenity-8f8a05996c5b47ec9401aabb517d96ed2af5c36b.zip | |
Upgrade rust-websocket, rust-openssl, and hyper
Upgrade `rust-websocket` to v0.20, maintaining use of its sync client.
This indirectly switches from `rust-openssl` v0.7 - which required
openssl-1.0 on all platforms - to `native-tls`, which allows for use of
schannel on Windows, Secure Transport on OSX, and openssl-1.1 on other
platforms.
Additionally, since hyper is no longer even a dependency of
rust-websocket, we can safely and easily upgrade to `hyper` v0.10 and
`multipart` v0.12.
This commit is fairly experimental as it has not been tested on a
long-running bot.
Diffstat (limited to 'Cargo.toml')
| -rw-r--r-- | Cargo.toml | 18 |
1 files changed, 14 insertions, 4 deletions
@@ -33,7 +33,11 @@ version = "0.2" [dependencies.hyper] optional = true -version = "~0.9" +version = "~0.10" + +[dependencies.hyper-native-tls] +optional = true +version = "0.2.2" [dependencies.lazy_static] optional = true @@ -43,7 +47,11 @@ version = "~0.2" default-features = false features = ["client", "hyper"] optional = true -version = "0.8" +version = "0.12" + +[dependencies.native-tls] +optional = true +version = "0.1" [dependencies.opus] optional = true @@ -59,8 +67,10 @@ optional = true version = "~0.3" [dependencies.websocket] +default-features = false +features = ["sync-ssl"] optional = true -version = "~0.17" +version = "~0.20" [features] default = [ @@ -79,7 +89,7 @@ client = ["gateway", "lazy_static", "http", "typemap"] extras = [] framework = ["client", "model", "utils"] gateway = ["http", "websocket"] -http = ["hyper", "lazy_static", "multipart"] +http = ["hyper", "hyper-native-tls", "lazy_static", "multipart", "native-tls"] model = ["builder", "http"] utils = [] voice = ["byteorder", "gateway", "opus", "sodiumoxide"] |