Skip to content

Commit 1038959

Browse files
committed
uv: update to v0.10.27
1 parent 793c76e commit 1038959

15 files changed

Lines changed: 237 additions & 27 deletions

File tree

deps/uv/.mailmap

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
11
Alan Gutierrez <alan@prettyrobots.com> <alan@blogometer.com>
2+
Andrius Bentkus <andrius.bentkus@gmail.com> <toxedvirus@gmail.com>
23
Bert Belder <bertbelder@gmail.com> <info@2bs.nl>
34
Bert Belder <bertbelder@gmail.com> <user@ChrUbuntu.(none)>
45
Brandon Philips <brandon.philips@rackspace.com> <brandon@ifup.org>
56
Brian White <mscdex@mscdex.net>
67
Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
8+
Fedor Indutny <fedor.indutny@gmail.com> <fedor@indutny.com>
79
Frank Denis <github@pureftpd.org>
810
Isaac Z. Schlueter <i@izs.me>
11+
Justin Venus <justin.venus@gmail.com> <justin.venus@orbitz.com>
12+
Keno Fischer <kenof@stanford.edu> <kfischer@college.harvard.edu>
13+
Keno Fischer <kenof@stanford.edu> <kfischer+github@college.harvard.edu>
14+
Maciej Małecki <maciej.malecki@notimplemented.org> <me@mmalecki.com>
915
Marc Schlaich <marc.schlaich@googlemail.com> <marc.schlaich@gmail.com>
16+
Rasmus Pedersen <ruysch@outlook.com> <zerhacken@yahoo.com>
1017
Robert Mustacchi <rm@joyent.com> <rm@fingolfin.org>
1118
Ryan Dahl <ryan@joyent.com> <ry@tinyclouds.org>
1219
Ryan Emery <seebees@gmail.com>
20+
Sam Roberts <vieuxtech@gmail.com> <sam@strongloop.com>
1321
San-Tai Hsu <vanilla@fatpipi.com>
1422
Saúl Ibarra Corretgé <saghul@gmail.com>
1523
Shigeki Ohtsu <ohtsu@iij.ad.jp> <ohtsu@ohtsu.org>

deps/uv/AUTHORS

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,39 @@ Luca Bruno <lucab@debian.org>
9494
Trevor Norris <trev.norris@gmail.com>
9595
Oguz Bastemur <obastemur@gmail.com>
9696
Alexis Campailla <alexis@janeasystems.com>
97+
Justin Venus <justin.venus@gmail.com>
98+
Ben Kelly <ben@wanderview.com>
99+
Kristian Evensen <kristian.evensen@gmail.com>
100+
Sean Silva <chisophugis@gmail.com>
101+
Linus Mårtensson <linus.martensson@sonymobile.com>
102+
Navaneeth Kedaram Nambiathan <navaneethkn@gmail.com>
103+
Brent Cook <brent@boundary.com>
104+
Brian Kaisner <bkize1@gmail.com>
105+
Reini Urban <rurban@cpanel.net>
106+
Maks Naumov <maksqwe1@ukr.net>
107+
Sean Farrell <sean.farrell@rioki.org>
108+
Christoph Iserlohn <christoph.iserlohn@innoq.com>
109+
Steven Kabbes <stevenkabbes@gmail.com>
110+
Tenor Biel <tenorbiel@gmail.com>
111+
Andrej Manduch <AManduch@gmail.com>
112+
Joshua Neuheisel <joshua@neuheisel.us>
113+
Yorkie <yorkiefixer@gmail.com>
114+
Sam Roberts <vieuxtech@gmail.com>
115+
River Tarnell <river@loreley.flyingparchment.org.uk>
116+
Nathan Sweet <nathanjsweet@gmail.com>
117+
Dylan Cali <calid1984@gmail.com>
118+
Austin Foxley <austinf@cetoncorp.com>
119+
Geoffry Song <goffrie@gmail.com>
120+
Benjamin Saunders <ben.e.saunders@gmail.com>
121+
Rasmus Pedersen <ruysch@outlook.com>
122+
William Light <wrl@illest.net>
123+
Oleg Efimov <o.efimov@corp.badoo.com>
124+
Lars Gierth <larsg@systemli.org>
125+
StarWing <weasley.wx@gmail.com>
126+
thierry-FreeBSD <thierry@FreeBSD.org>
127+
Isaiah Norton <isaiah.norton@gmail.com>
128+
Raul Martins <raulms.martins@gmail.com>
129+
David Capello <davidcapello@gmail.com>
130+
Paul Tan <pyokagan@gmail.com>
131+
Javier Hernández <jhernandez@emergya.com>
132+
Tonis Tiigi <tonistiigi@gmail.com>

deps/uv/ChangeLog

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,32 @@
1-
2014.02.19, Version 0.10.25 (Stable)
1+
2014.05.02, Version 0.10.27 (Stable)
2+
3+
Changes since version 0.10.26:
4+
5+
* windows: fix console signal handler refcount (Saúl Ibarra Corretgé)
6+
7+
* win: always leave crit section in get_proc_title (Fedor Indutny)
8+
9+
10+
2014.04.07, Version 0.10.26 (Stable), d864907611c25ec986c5e77d4d6d6dee88f26926
11+
12+
Changes since version 0.10.25:
13+
14+
* process: don't close stdio fds during spawn (Tonis Tiigi)
15+
16+
* build, windows: do not fail on Windows SDK Prompt (Marc Schlaich)
17+
18+
* build, windows: fix x64 configuration issue (Marc Schlaich)
19+
20+
* win: fix buffer leak on error in pipe.c (Fedor Indutny)
21+
22+
* kqueue: invalidate fd in uv_fs_event_t (Fedor Indutny)
23+
24+
* linux: always deregister closing fds from epoll (Geoffry Song)
25+
26+
* error: add ENXIO for O_NONBLOCK FIFO open() (Fedor Indutny)
27+
28+
29+
2014.02.19, Version 0.10.25 (Stable), d778dc588507588b12b9f9d2905078db542ed751
230

331
Changes since version 0.10.24:
432

deps/uv/include/uv.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,12 @@ extern "C" {
130130
XX( 57, ENODEV, "no such device") \
131131
XX( 58, ESPIPE, "invalid seek") \
132132
XX( 59, ECANCELED, "operation canceled") \
133+
XX( 60, EFBIG, "file too large") \
134+
XX( 61, ENOPROTOOPT, "protocol not available") \
135+
XX( 62, ETXTBSY, "text file is busy") \
136+
XX( 63, ERANGE, "result too large") \
137+
XX( 64, ENXIO, "no such device or address") \
138+
XX( 65, EMLINK, "too many links") \
133139

134140

135141
#define UV_ERRNO_GEN(val, name, s) UV_##name = val,

deps/uv/src/unix/error.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,12 @@ uv_err_code uv_translate_sys_error(int sys_errno) {
104104
case EROFS: return UV_EROFS;
105105
case ENOMEM: return UV_ENOMEM;
106106
case EDQUOT: return UV_ENOSPC;
107+
case EFBIG: return UV_EFBIG;
108+
case ENOPROTOOPT: return UV_ENOPROTOOPT;
109+
case ETXTBSY: return UV_ETXTBSY;
110+
case ERANGE: return UV_ERANGE;
111+
case ENXIO: return UV_ENXIO;
112+
case EMLINK: return UV_EMLINK;
107113
default: return UV_UNKNOWN;
108114
}
109115
UNREACHABLE();

deps/uv/src/unix/kqueue.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,10 @@ int uv_fs_event_init(uv_loop_t* loop,
359359
void uv__fs_event_close(uv_fs_event_t* handle) {
360360
#if defined(__APPLE__)
361361
if (uv__fsevents_close(handle))
362-
uv__io_stop(handle->loop, &handle->event_watcher, UV__POLLIN);
363-
#else
364-
uv__io_stop(handle->loop, &handle->event_watcher, UV__POLLIN);
365362
#endif /* defined(__APPLE__) */
363+
{
364+
uv__io_close(handle->loop, &handle->event_watcher);
365+
}
366366

367367
uv__handle_stop(handle);
368368

deps/uv/src/unix/linux-core.c

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,20 +99,28 @@ void uv__platform_loop_delete(uv_loop_t* loop) {
9999

100100
void uv__platform_invalidate_fd(uv_loop_t* loop, int fd) {
101101
struct uv__epoll_event* events;
102+
struct uv__epoll_event dummy;
102103
uintptr_t i;
103104
uintptr_t nfds;
104105

105106
assert(loop->watchers != NULL);
106107

107108
events = (struct uv__epoll_event*) loop->watchers[loop->nwatchers];
108109
nfds = (uintptr_t) loop->watchers[loop->nwatchers + 1];
109-
if (events == NULL)
110-
return;
111-
112-
/* Invalidate events with same file descriptor */
113-
for (i = 0; i < nfds; i++)
114-
if ((int) events[i].data == fd)
115-
events[i].data = -1;
110+
if (events != NULL)
111+
/* Invalidate events with same file descriptor */
112+
for (i = 0; i < nfds; i++)
113+
if ((int) events[i].data == fd)
114+
events[i].data = -1;
115+
116+
/* Remove the file descriptor from the epoll.
117+
* This avoids a problem where the same file description remains open
118+
* in another process, causing repeated junk epoll events.
119+
*
120+
* We pass in a dummy epoll_event, to work around a bug in old kernels.
121+
*/
122+
if (loop->backend_fd >= 0)
123+
uv__epoll_ctl(loop->backend_fd, UV__EPOLL_CTL_DEL, fd, &dummy);
116124
}
117125

118126

deps/uv/src/unix/process.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,6 @@ static void uv__process_child_init(uv_process_options_t options,
302302

303303
if (use_fd == -1) {
304304
uv__write_int(error_fd, errno);
305-
perror("failed to open stdio");
306305
_exit(127);
307306
}
308307
}
@@ -316,7 +315,7 @@ static void uv__process_child_init(uv_process_options_t options,
316315
if (fd <= 2)
317316
uv__nonblock(fd, 0);
318317

319-
if (close_fd != -1)
318+
if (close_fd >= stdio_count)
320319
close(close_fd);
321320
}
322321

@@ -329,19 +328,16 @@ static void uv__process_child_init(uv_process_options_t options,
329328

330329
if (options.cwd && chdir(options.cwd)) {
331330
uv__write_int(error_fd, errno);
332-
perror("chdir()");
333331
_exit(127);
334332
}
335333

336334
if ((options.flags & UV_PROCESS_SETGID) && setgid(options.gid)) {
337335
uv__write_int(error_fd, errno);
338-
perror("setgid()");
339336
_exit(127);
340337
}
341338

342339
if ((options.flags & UV_PROCESS_SETUID) && setuid(options.uid)) {
343340
uv__write_int(error_fd, errno);
344-
perror("setuid()");
345341
_exit(127);
346342
}
347343

@@ -351,7 +347,6 @@ static void uv__process_child_init(uv_process_options_t options,
351347

352348
execvp(options.file, options.args);
353349
uv__write_int(error_fd, errno);
354-
perror("execvp()");
355350
_exit(127);
356351
}
357352

deps/uv/src/version.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
#define UV_VERSION_MAJOR 0
3636
#define UV_VERSION_MINOR 10
37-
#define UV_VERSION_PATCH 25
37+
#define UV_VERSION_PATCH 27
3838
#define UV_VERSION_IS_RELEASE 1
3939

4040

deps/uv/src/win/pipe.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,9 +1240,9 @@ static void uv_pipe_read_eof(uv_loop_t* loop, uv_pipe_t* handle,
12401240

12411241
uv__set_artificial_error(loop, UV_EOF);
12421242
if (handle->read2_cb) {
1243-
handle->read2_cb(handle, -1, uv_null_buf_, UV_UNKNOWN_HANDLE);
1243+
handle->read2_cb(handle, -1, buf, UV_UNKNOWN_HANDLE);
12441244
} else {
1245-
handle->read_cb((uv_stream_t*) handle, -1, uv_null_buf_);
1245+
handle->read_cb((uv_stream_t*) handle, -1, buf);
12461246
}
12471247
}
12481248

@@ -1404,7 +1404,7 @@ void uv_process_pipe_read_req(uv_loop_t* loop, uv_pipe_t* handle,
14041404
break;
14051405
}
14061406
} else {
1407-
uv_pipe_read_error_or_eof(loop, handle, GetLastError(), uv_null_buf_);
1407+
uv_pipe_read_error_or_eof(loop, handle, GetLastError(), buf);
14081408
break;
14091409
}
14101410
}

0 commit comments

Comments
 (0)