From a6f5d48cca0ebaedab1d34afbff69beaf7e29313 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Tue, 25 Aug 2020 13:14:37 +1000 Subject: [PATCH] Revert "vendor reqwest for now, to support read/write timeouts" This reverts commit b3edeaac8696d7be56b2435e8cb2a627de6a3ad3. The separate read and write timeouts were causing syncs to fail - a long full upload would time out due to no read activity for example. Reverting until a better fix can be put in place. --- rslib/Cargo.toml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/rslib/Cargo.toml b/rslib/Cargo.toml index d3395652f..a898560e9 100644 --- a/rslib/Cargo.toml +++ b/rslib/Cargo.toml @@ -61,15 +61,11 @@ features = ["trace", "functions", "collation"] version = "0.23.1" features = ["trace", "functions", "collation", "bundled"] -[target.'cfg(linux)'.dependencies.reqwest] -git = "https://github.com/ankitects/reqwest.git" -branch = "io-timeout" -features = ["json", "socks", "stream", "native-tls-vendored"] +[target.'cfg(linux)'.dependencies] +reqwest = { version = "0.10.6", features = ["json", "socks", "stream", "native-tls-vendored"] } -[target.'cfg(not(linux))'.dependencies.reqwest] -git = "https://github.com/ankitects/reqwest.git" -branch = "io-timeout" -features = ["json", "socks", "stream"] +[target.'cfg(not(linux))'.dependencies] +reqwest = { version = "0.10.6", features = ["json", "socks", "stream" ] } [build-dependencies] prost-build = "0.6.1"