From 773f587912ae1297bdc5c6f4b9ab9391c38eb76a Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Fri, 22 Jul 2022 22:02:58 +0200 Subject: [PATCH] deps: cherry-pick libuv/libuv@3a7b955 Original commit log follows: darwin: translate EPROTOTYPE to ECONNRESET (libuv/libuv#3413) macOS versions 10.10 and 10.15 - and presumbaly 10.11 to 10.14, too - have a bug where a race condition causes the kernel to return EPROTOTYPE because the socket isn't fully constructed. It's probably the result of the peer closing the connection and that is why libuv translates it to ECONNRESET. Previously, libuv retried until the EPROTOTYPE error went away but some VPN software causes the same behavior except the error is permanent, not transient, turning the retry mechanism into an infinite loop. Refs: https://github.com/libuv/libuv/pull/482 Refs: https://github.com/libuv/libuv/pull/3405 Fixes: https://github.com/nodejs/node/issues/43916 PR-URL: https://github.com/nodejs/node/pull/43950 Reviewed-By: Luigi Pinca Reviewed-By: Colin Ihrig Reviewed-By: Santiago Gimeno Reviewed-By: Matteo Collina --- deps/uv/src/unix/stream.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/deps/uv/src/unix/stream.c b/deps/uv/src/unix/stream.c index 1af448e7691392..9d22debf2bf5bd 100644 --- a/deps/uv/src/unix/stream.c +++ b/deps/uv/src/unix/stream.c @@ -865,6 +865,20 @@ static int uv__try_write(uv_stream_t* stream, if (errno == EAGAIN || errno == EWOULDBLOCK || errno == ENOBUFS) return UV_EAGAIN; +#ifdef __APPLE__ + /* macOS versions 10.10 and 10.15 - and presumbaly 10.11 to 10.14, too - + * have a bug where a race condition causes the kernel to return EPROTOTYPE + * because the socket isn't fully constructed. It's probably the result of + * the peer closing the connection and that is why libuv translates it to + * ECONNRESET. Previously, libuv retried until the EPROTOTYPE error went + * away but some VPN software causes the same behavior except the error is + * permanent, not transient, turning the retry mechanism into an infinite + * loop. See https://github.com/libuv/libuv/pull/482. + */ + if (errno == EPROTOTYPE) + return UV_ECONNRESET; +#endif /* __APPLE__ */ + return UV__ERR(errno); }