Upgrade libuv to 8409a67

nodejs · Mar 22, 2012 · d227084 · d227084
1 parent a7cd76b
commit d227084
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/deps/uv/include/uv.h b/deps/uv/include/uv.h
@@ -120,7 +120,8 @@ typedef intptr_t ssize_t;
   XX( 50, EPERM, "operation not permitted") \
   XX( 51, ELOOP, "too many symbolic links encountered") \
   XX( 52, EXDEV, "cross-device link not permitted") \
-  XX( 53, ENOTEMPTY, "directory not empty")
+  XX( 53, ENOTEMPTY, "directory not empty") \
+  XX( 54, ENOSPC, "no space left on device")
 
 
 #define UV_ERRNO_GEN(val, name, s) UV_##name = val,

diff --git a/deps/uv/src/unix/error.c b/deps/uv/src/unix/error.c
@@ -90,6 +90,7 @@ uv_err_code uv_translate_sys_error(int sys_errno) {
     case EXDEV: return UV_EXDEV;
     case EBUSY: return UV_EBUSY;
     case ENOTEMPTY: return UV_ENOTEMPTY;
+    case ENOSPC: return UV_ENOSPC;
     default: return UV_UNKNOWN;
   }
 

diff --git a/deps/uv/src/unix/stream.c b/deps/uv/src/unix/stream.c
@@ -182,6 +182,9 @@ void uv__server_io(EV_P_ ev_io* watcher, int revents) {
       } else if (errno == EMFILE) {
         /* TODO special trick. unlock reserved socket, accept, close. */
         return;
+      } else if (errno == ECONNABORTED) {
+        /* ignore */
+        continue;
       } else {
         uv__set_sys_error(stream->loop, errno);
         stream->connection_cb((uv_stream_t*)stream, -1);

diff --git a/deps/uv/src/win/error.c b/deps/uv/src/win/error.c
@@ -104,6 +104,11 @@ uv_err_code uv_translate_sys_error(int sys_errno) {
     case WSAENETUNREACH:                    return UV_ENETUNREACH;
     case WSAENOBUFS:                        return UV_ENOBUFS;
     case ERROR_OUTOFMEMORY:                 return UV_ENOMEM;
+    case ERROR_CANNOT_MAKE:                 return UV_ENOSPC;
+    case ERROR_DISK_FULL:                   return UV_ENOSPC;
+    case ERROR_EA_TABLE_FULL:               return UV_ENOSPC;
+    case ERROR_END_OF_MEDIA:                return UV_ENOSPC;
+    case ERROR_HANDLE_DISK_FULL:            return UV_ENOSPC;
     case ERROR_NOT_CONNECTED:               return UV_ENOTCONN;
     case WSAENOTCONN:                       return UV_ENOTCONN;
     case ERROR_DIR_NOT_EMPTY:               return UV_ENOTEMPTY;

diff --git a/deps/uv/src/win/winapi.h b/deps/uv/src/win/winapi.h
@@ -4323,10 +4323,17 @@ typedef NTSTATUS (NTAPI *sNtSetInformationFile)
 /*
  * Kernel32 headers
  */
-#define FILE_SKIP_COMPLETION_PORT_ON_SUCCESS    0x1
-#define FILE_SKIP_SET_EVENT_ON_HANDLE           0x2
+#ifndef FILE_SKIP_COMPLETION_PORT_ON_SUCCESS
+# define FILE_SKIP_COMPLETION_PORT_ON_SUCCESS 0x1
+#endif
+
+#ifndef FILE_SKIP_SET_EVENT_ON_HANDLE
+# define FILE_SKIP_SET_EVENT_ON_HANDLE 0x2
+#endif
 
-#define SYMBOLIC_LINK_FLAG_DIRECTORY            0x1
+#ifndef SYMBOLIC_LINK_FLAG_DIRECTORY
+# define SYMBOLIC_LINK_FLAG_DIRECTORY 0x1
+#endif
 
 #ifdef __MINGW32__
   typedef struct _OVERLAPPED_ENTRY {