Set accepted TcpStreams in non-blocking mode

tokio-rs · Sep 12, 2019 · 4793629 · 4793629
1 parent 6b02a62
commit 4793629
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/src/sys/unix/tcp_listener.rs b/src/sys/unix/tcp_listener.rs
@@ -49,9 +49,11 @@ impl TcpListener {
  }
 
  pub fn accept(&self) -> io::Result<(TcpStream, SocketAddr)> {
- self.inner
- .accept()
- .map(|(inner, addr)| (TcpStream::new(inner), addr))
+ self.inner.accept().and_then(|(inner, addr)| {
+ inner
+ .set_nonblocking(true)
+ .map(|()| (TcpStream::new(inner), addr))
+ })
  }
 
  pub fn set_ttl(&self, ttl: u32) -> io::Result<()> {

diff --git a/src/sys/windows/tcp.rs b/src/sys/windows/tcp.rs
@@ -359,14 +359,16 @@ impl TcpListener {
  }
 
  pub fn accept(&self) -> io::Result<(TcpStream, SocketAddr)> {
- wouldblock!(self, accept).map(|(inner, addr)| {
- (
- TcpStream {
- internal: Arc::new(Mutex::new(None)),
- inner,
- },
- addr,
- )
+ wouldblock!(self, accept).and_then(|(inner, addr)| {
+ inner.set_nonblocking(true).map(|()| {
+ (
+ TcpStream {
+ internal: Arc::new(Mutex::new(None)),
+ inner,
+ },
+ addr,
+ )
+ })
  })
  }