Merge branch 'v0.8'

Conflicts: include/uv.h
joyent · Aug 25, 2012 · a3c6a48 · a3c6a48
2 parents 343be71 + ad7b48a
commit a3c6a48
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/include/uv.h b/include/uv.h
@@ -120,9 +120,10 @@ extern "C" {
   XX( 53, ENOTEMPTY, "directory not empty")                                   \
   XX( 54, ENOSPC, "no space left on device")                                  \
   XX( 55, EIO, "i/o error")                                                   \
-  XX( 56, EROFS, "read-only file system" )                                    \
-  XX( 57, ENODEV, "no such device" )                                          \
-  XX( 58, ECANCELED, "operation canceled" )
+  XX( 56, EROFS, "read-only file system")                                     \
+  XX( 57, ENODEV, "no such device")                                           \
+  XX( 58, ESPIPE, "invalid seek")                                             \
+  XX( 59, ECANCELED, "operation canceled")                                    \
 
 
 #define UV_ERRNO_GEN(val, name, s) UV_##name = val,

diff --git a/src/unix/error.c b/src/unix/error.c
@@ -68,6 +68,7 @@ uv_err_code uv_translate_sys_error(int sys_errno) {
     case EAFNOSUPPORT: return UV_EAFNOSUPPORT;
     case EBADF: return UV_EBADF;
     case EPIPE: return UV_EPIPE;
+    case ESPIPE: return UV_ESPIPE;
     case EAGAIN: return UV_EAGAIN;
 #if EWOULDBLOCK != EAGAIN
     case EWOULDBLOCK: return UV_EAGAIN;

diff --git a/src/unix/udp.c b/src/unix/udp.c
@@ -86,6 +86,10 @@ void uv__udp_finish_close(uv_udp_t* handle) {
     req = ngx_queue_data(q, uv_udp_send_t, queue);
     uv__req_unregister(handle->loop, req);
 
+    if (req->bufs != req->bufsml)
+      free(req->bufs);
+    req->bufs = NULL;
+
     if (req->send_cb) {
       /* FIXME proper error code like UV_EABORTED */
       uv__set_artificial_error(handle->loop, UV_EINTR);
@@ -171,6 +175,7 @@ static void uv__udp_run_completed(uv_udp_t* handle) {
 
     if (req->bufs != req->bufsml)
       free(req->bufs);
+    req->bufs = NULL;
 
     if (req->send_cb == NULL)
       continue;