Merge pull request #696 from hyperium/promote-timeouts

feat(all): add socket timeouts
2015-11-24 12:01:29 -08:00
parent c747f99d21 fec6e3e873
commit 53a2233912
12 changed files with 24 additions and 109 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,5 +47,4 @@ env_logger = "*"
 default = ["ssl"]
 ssl = ["openssl", "cookie/secure"]
 serde-serialization = ["serde"]
-timeouts = []
-nightly = ["timeouts"]
+nightly = []