Browse Source

uv: Upgrade to 86ae8b3c

v0.8.21-release
isaacs 12 years ago
parent
commit
ff540e19a4
  1. 4
      deps/uv/gyp_uv
  2. 7
      deps/uv/src/unix/pipe.c

4
deps/uv/gyp_uv

@ -22,7 +22,9 @@ def compiler_version():
proc = subprocess.Popen(CC.split() + ['--version'], stdout=subprocess.PIPE)
is_clang = 'clang' in proc.communicate()[0].split('\n')[0]
proc = subprocess.Popen(CC.split() + ['-dumpversion'], stdout=subprocess.PIPE)
version = tuple(map(int, proc.communicate()[0].split('.')))
version = proc.communicate()[0].split('.')
version = map(int, version[:2])
version = tuple(version)
return (version, is_clang)

7
deps/uv/src/unix/pipe.c

@ -186,15 +186,13 @@ void uv_pipe_connect(uv_connect_t* req,
uv_strlcpy(saddr.sun_path, name, sizeof(saddr.sun_path));
saddr.sun_family = AF_UNIX;
/* We don't check for EINPROGRESS. Think about it: the socket
* is either there or not.
*/
do {
r = connect(handle->fd, (struct sockaddr*)&saddr, sizeof saddr);
}
while (r == -1 && errno == EINTR);
if (r == -1)
if (errno != EINPROGRESS)
goto out;
if (new_sock)
@ -216,7 +214,8 @@ out:
req->cb = cb;
ngx_queue_init(&req->queue);
/* Run callback on next tick. */
/* Force callback to run on next tick in case of error. */
if (err != 0)
uv__io_feed(handle->loop, &handle->write_watcher, UV__IO_WRITE);
/* Mimic the Windows pipe implementation, always

Loading…
Cancel
Save