stream: squelch ECONNRESET error if already closed

src/unix/internal.h

@@ -89,10 +89,11 @@
 #endif
 
 #if defined(__linux__)
-# define UV__POLLIN   UV__EPOLLIN
-# define UV__POLLOUT  UV__EPOLLOUT
-# define UV__POLLERR  UV__EPOLLERR
-# define UV__POLLHUP  UV__EPOLLHUP
+# define UV__POLLIN     UV__EPOLLIN
+# define UV__POLLOUT    UV__EPOLLOUT
+# define UV__POLLERR    UV__EPOLLERR
+# define UV__POLLHUP    UV__EPOLLHUP
+# define UV__POLLRDHUP  UV__EPOLLRDHUP
 #endif
 
 #if defined(__sun) || defined(_AIX)
@@ -118,6 +119,10 @@
 # define UV__POLLHUP  8
 #endif
 
+#ifndef UV__POLLRDHUP
+# define UV__POLLRDHUP  16
+#endif
+
 #if !defined(O_CLOEXEC) && defined(__FreeBSD__)
 /*
  * It may be that we are just missing `__POSIX_VISIBLE >= 200809`.
@@ -143,6 +148,7 @@ enum {
   UV_TCP_NODELAY          = 0x400,  /* Disable Nagle. */
   UV_TCP_KEEPALIVE        = 0x800,  /* Turn on keep-alive. */
   UV_TCP_SINGLE_ACCEPT    = 0x1000, /* Only accept() when idle. */
+  UV_STREAM_DISCONNECT    = 0x2000, /* Remote end is forcibly closed */
   UV_HANDLE_IPV6          = 0x10000, /* Handle is bound to a IPv6 socket. */
   UV_UDP_PROCESSING       = 0x20000  /* Handle is running the send callback queue. */
 };

src/unix/kqueue.c

@@ -241,6 +241,9 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
       if (ev->flags & EV_ERROR)
         revents |= UV__POLLERR;
 
+      if (ev->flags & EV_EOF)
+        revents |= UV__POLLRDHUP;
+
       if (revents == 0)
         continue;
 

src/unix/linux-core.c

@@ -183,7 +183,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
     assert(w->fd >= 0);
     assert(w->fd < (int) loop->nwatchers);
 
-    e.events = w->pevents;
+    e.events = w->pevents | UV__POLLRDHUP;
     e.data = w->fd;
 
     if (w->events == 0)
@@ -321,7 +321,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
        * the current watcher. Also, filters out events that users has not
        * requested us to watch.
        */
-      pe->events &= w->pevents | UV__POLLERR | UV__POLLHUP;
+      pe->events &= w->pevents | UV__POLLERR | UV__POLLHUP | UV__POLLRDHUP;
 
       /* Work around an epoll quirk where it sometimes reports just the
        * EPOLLERR or EPOLLHUP event.  In order to force the event loop to

src/unix/linux-syscalls.h

@@ -76,6 +76,7 @@
 #define UV__EPOLLOUT          4
 #define UV__EPOLLERR          8
 #define UV__EPOLLHUP          16
+#define UV__EPOLLRDHUP        0x2000
 #define UV__EPOLLONESHOT      0x40000000
 #define UV__EPOLLET           0x80000000
 

src/unix/stream.c

@@ -1140,6 +1140,11 @@ static void uv__read(uv_stream_t* stream) {
         }
         stream->read_cb(stream, 0, &buf);
       } else {
+        if ((errno == ECONNRESET) && (stream->flags & UV_STREAM_DISCONNECT)) {
+          uv__stream_eof(stream, &buf);
+          return;
+        }
+
         /* Error. User should call uv_close(). */
         stream->read_cb(stream, -errno, &buf);
         if (stream->flags & UV_STREAM_READING) {
@@ -1227,8 +1232,13 @@ static void uv__stream_io(uv_loop_t* loop, uv__io_t* w, unsigned int events) {
   assert(uv__stream_fd(stream) >= 0);
 
   /* Ignore POLLHUP here. Even it it's set, there may still be data to read. */
-  if (events & (UV__POLLIN | UV__POLLERR | UV__POLLHUP))
+  if (events & (UV__POLLIN | UV__POLLERR | UV__POLLHUP)) {
+    if (events & UV__POLLRDHUP) {
+      stream->flags |= UV_STREAM_DISCONNECT;
+    }
+
     uv__read(stream);
+  }
 
   if (uv__stream_fd(stream) == -1)
     return;  /* read_cb closed stream. */