Skip to content

Commit

Permalink
Revert "vendor reqwest for now, to support read/write timeouts"
Browse files Browse the repository at this point in the history
This reverts commit cf247ba.

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.
  • Loading branch information
dae committed Aug 25, 2020
1 parent 7d7c791 commit ef7f61a
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions rslib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit ef7f61a

Please sign in to comment.