From 5f91f5eda6f3b61d91a63b5ef651ef9f2617d7b7 Mon Sep 17 00:00:00 2001
From: Douman <douman@gmx.se>
Date: Fri, 26 Oct 2018 10:59:06 +0300
Subject: [PATCH] Correct IoStream::set_keepalive for UDS (#564)
Enable uds feature in tests
---
.travis.yml | 2 +-
src/server/mod.rs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index c5dfcd81b..9b1bcff54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ script:
cargo check --features rust-tls
cargo check --features ssl
cargo check --features tls
- cargo test --features="ssl,tls,rust-tls" -- --nocapture
+ cargo test --features="ssl,tls,rust-tls,uds" -- --nocapture
fi
- |
if [[ "$TRAVIS_RUST_VERSION" == "nightly" ]]; then
diff --git a/src/server/mod.rs b/src/server/mod.rs
index 8d7195166..0a16f26b9 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -334,7 +334,7 @@ impl IoStream for ::tokio_uds::UnixStream {
}
#[inline]
- fn set_keepalive(&mut self, _nodelay: bool) -> io::Result<()> {
+ fn set_keepalive(&mut self, _dur: Option<time::Duration>) -> io::Result<()> {
Ok(())
}
}