7 files changed, 56 insertions, 3 deletions
diff --git a/deps/uv/src/unix/internal.h b/deps/uv/src/unix/internal.h
index b6df1ab9d3..63e478fd98 100644
--- a/deps/uv/src/unix/internal.h
+++ b/deps/uv/src/unix/internal.h
@@ -185,6 +185,18 @@ struct uv__stream_queued_fds_s {
 #define uv__nonblock uv__nonblock_fcntl
 #endif
 
+/* On Linux, uv__nonblock_fcntl() and uv__nonblock_ioctl() do not commute
+ * when O_NDELAY is not equal to O_NONBLOCK.  Case in point: linux/sparc32
+ * and linux/sparc64, where O_NDELAY is O_NONBLOCK + another bit.
+ *
+ * Libuv uses uv__nonblock_fcntl() directly sometimes so ensure that it
+ * commutes with uv__nonblock().
+ */
+#if defined(__linux__) && O_NDELAY != O_NONBLOCK
+#undef uv__nonblock
+#define uv__nonblock uv__nonblock_fcntl
+#endif
+
 /* core */
 int uv__cloexec_ioctl(int fd, int set);
 int uv__cloexec_fcntl(int fd, int set);
diff --git a/deps/uv/src/unix/os390-syscalls.c b/deps/uv/src/unix/os390-syscalls.c
index 21558ea868..a5dd34426d 100644
--- a/deps/uv/src/unix/os390-syscalls.c
+++ b/deps/uv/src/unix/os390-syscalls.c
@@ -215,6 +215,7 @@ uv__os390_epoll* epoll_create1(int flags) {
     maybe_resize(lst, 1);
     lst->items[lst->size - 1].fd = lst->msg_queue;
     lst->items[lst->size - 1].events = POLLIN;
+    lst->items[lst->size - 1].revents = 0;
     uv_once(&once, epoll_init);
     uv_mutex_lock(&global_epoll_lock);
     QUEUE_INSERT_TAIL(&global_epoll_queue, &lst->member);
@@ -252,6 +253,7 @@ int epoll_ctl(uv__os390_epoll* lst,
     }
     lst->items[fd].fd = fd;
     lst->items[fd].events = event->events;
+    lst->items[fd].revents = 0;
   } else if (op == EPOLL_CTL_MOD) {
     if (fd >= lst->size || lst->items[fd].fd == -1) {
       uv_mutex_unlock(&global_epoll_lock);
diff --git a/deps/uv/src/win/getaddrinfo.c b/deps/uv/src/win/getaddrinfo.c
index 282d919cf7..5adc7663bd 100644
--- a/deps/uv/src/win/getaddrinfo.c
+++ b/deps/uv/src/win/getaddrinfo.c
@@ -392,15 +392,21 @@ int uv_if_indextoname(unsigned int ifindex, char* buffer, size_t* size) {
   DWORD bufsize;
   int r;
 
+  uv__once_init();
+
   if (buffer == NULL || size == NULL || *size == 0)
     return UV_EINVAL;
 
-  r = ConvertInterfaceIndexToLuid(ifindex, &luid);
+  if (pConvertInterfaceIndexToLuid == NULL)
+    return UV_ENOSYS;
+  r = pConvertInterfaceIndexToLuid(ifindex, &luid);
 
   if (r != 0)
     return uv_translate_sys_error(r);
 
-  r = ConvertInterfaceLuidToNameW(&luid, wname, ARRAY_SIZE(wname));
+  if (pConvertInterfaceLuidToNameW == NULL)
+    return UV_ENOSYS;
+  r = pConvertInterfaceLuidToNameW(&luid, wname, ARRAY_SIZE(wname));
 
   if (r != 0)
     return uv_translate_sys_error(r);
diff --git a/deps/uv/src/win/pipe.c b/deps/uv/src/win/pipe.c
index 0ecfbf1f0e..83ee4f99ca 100644
--- a/deps/uv/src/win/pipe.c
+++ b/deps/uv/src/win/pipe.c
@@ -735,6 +735,13 @@ void uv__pipe_unpause_read(uv_pipe_t* handle) {
 
 
 void uv__pipe_stop_read(uv_pipe_t* handle) {
+  if (pCancelIoEx &&
+      !(handle->flags & UV_HANDLE_NON_OVERLAPPED_PIPE) &&
+      !(handle->flags & UV_HANDLE_EMULATE_IOCP) &&
+      handle->flags & UV_HANDLE_READING &&
+      handle->read_req.type == UV_READ) {
+    pCancelIoEx(handle->handle, &handle->read_req.u.io.overlapped);
+  }
   handle->flags &= ~UV_HANDLE_READING;
   uv__pipe_pause_read((uv_pipe_t*)handle);
   uv__pipe_unpause_read((uv_pipe_t*)handle);
diff --git a/deps/uv/src/win/util.c b/deps/uv/src/win/util.c
index 5d1c812dd7..49b5bc7206 100644
--- a/deps/uv/src/win/util.c
+++ b/deps/uv/src/win/util.c
@@ -37,7 +37,7 @@
 #include <tlhelp32.h>
 #include <windows.h>
 #include <userenv.h>
-
+#include <math.h>
 
 /*
  * Max title length; the only thing MSDN tells us about the maximum length
diff --git a/deps/uv/src/win/winapi.c b/deps/uv/src/win/winapi.c
index 4ccdf0a5f9..c330786142 100644
--- a/deps/uv/src/win/winapi.c
+++ b/deps/uv/src/win/winapi.c
@@ -55,12 +55,16 @@ sPowerRegisterSuspendResumeNotification pPowerRegisterSuspendResumeNotification;
 /* User32.dll function pointer */
 sSetWinEventHook pSetWinEventHook;
 
+/* iphlpapi.dll function pointer */
+sConvertInterfaceIndexToLuid pConvertInterfaceIndexToLuid = NULL;
+sConvertInterfaceLuidToNameW pConvertInterfaceLuidToNameW = NULL;
 
 void uv_winapi_init(void) {
   HMODULE ntdll_module;
   HMODULE kernel32_module;
   HMODULE powrprof_module;
   HMODULE user32_module;
+  HMODULE iphlpapi_module;
 
   ntdll_module = GetModuleHandleA("ntdll.dll");
   if (ntdll_module == NULL) {
@@ -166,4 +170,11 @@ void uv_winapi_init(void) {
       GetProcAddress(user32_module, "SetWinEventHook");
   }
 
+  iphlpapi_module = LoadLibraryA("iphlpapi.dll");
+  if (iphlpapi_module != NULL) {
+    pConvertInterfaceIndexToLuid = (sConvertInterfaceIndexToLuid)
+      GetProcAddress(iphlpapi_module, "ConvertInterfaceIndexToLuid");
+    pConvertInterfaceLuidToNameW = (sConvertInterfaceLuidToNameW)
+      GetProcAddress(iphlpapi_module, "ConvertInterfaceLuidToNameW");
+  }
 }
diff --git a/deps/uv/src/win/winapi.h b/deps/uv/src/win/winapi.h
index cc54b79b08..38570c2ffa 100644
--- a/deps/uv/src/win/winapi.h
+++ b/deps/uv/src/win/winapi.h
@@ -4775,4 +4775,19 @@ extern sPowerRegisterSuspendResumeNotification pPowerRegisterSuspendResumeNotifi
 /* User32.dll function pointer */
 extern sSetWinEventHook pSetWinEventHook;
 
+/* iphlpapi.dll function pointer */
+union _NET_LUID_LH;
+typedef DWORD (WINAPI *sConvertInterfaceIndexToLuid)(
+    ULONG InterfaceIndex,
+    union _NET_LUID_LH *InterfaceLuid);
+
+typedef DWORD (WINAPI *sConvertInterfaceLuidToNameW)(
+    const union _NET_LUID_LH *InterfaceLuid,
+    PWSTR InterfaceName,
+    size_t Length);
+
+extern sConvertInterfaceIndexToLuid pConvertInterfaceIndexToLuid;
+extern sConvertInterfaceLuidToNameW pConvertInterfaceLuidToNameW;
+
+
 #endif /* UV_WIN_WINAPI_H_ */