From 4d176b7b7c11aabc584bee45423f108ea47faefe Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Tue, 14 Dec 2021 23:27:04 +0100 Subject: fix(ext/net): make unix and tcp identical on close (#13075) std/http/server knows how to handle "Listener has been closed" exceptions but not "operation canceled" errors. Make "unix" listen sockets throw the same exception as "tcp" listen sockets when the socket is closed and has a pending accept operation. There is still a discrepancy when multiple accept requests are posted but that's probably a less visible issue and something for another day. Fixes #13033 --- ext/net/ops.rs | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'ext/net/ops.rs') diff --git a/ext/net/ops.rs b/ext/net/ops.rs index 739807123..538eab2d9 100644 --- a/ext/net/ops.rs +++ b/ext/net/ops.rs @@ -103,6 +103,15 @@ pub(crate) struct AcceptArgs { pub transport: String, } +pub(crate) fn accept_err(e: std::io::Error) -> AnyError { + // FIXME(bartlomieju): compatibility with current JS implementation + if let std::io::ErrorKind::Interrupted = e.kind() { + bad_resource("Listener has been closed") + } else { + e.into() + } +} + async fn accept_tcp( state: Rc>, args: AcceptArgs, @@ -119,15 +128,11 @@ async fn accept_tcp( .try_borrow_mut() .ok_or_else(|| custom_error("Busy", "Another accept task is ongoing"))?; let cancel = RcRef::map(resource, |r| &r.cancel); - let (tcp_stream, _socket_addr) = - listener.accept().try_or_cancel(cancel).await.map_err(|e| { - // FIXME(bartlomieju): compatibility with current JS implementation - if let std::io::ErrorKind::Interrupted = e.kind() { - bad_resource("Listener has been closed") - } else { - e.into() - } - })?; + let (tcp_stream, _socket_addr) = listener + .accept() + .try_or_cancel(cancel) + .await + .map_err(accept_err)?; let local_addr = tcp_stream.local_addr()?; let remote_addr = tcp_stream.peer_addr()?; -- cgit v1.2.3