daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v0.8.21-release' into v0.8

pull/24502/head
isaacs 2013-02-25 13:51:15 -08:00
parent b0e7dbf2c0 530d8c05d4
commit 7b92b301fa
5 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -380,3 +380,4 @@ Dan Milon <danmilon@gmail.com>
Jacob Gable <jacob.gable@gmail.com> Jacob Gable <jacob.gable@gmail.com>
Rick Yakubowski <richard@orpha-systems.com> Rick Yakubowski <richard@orpha-systems.com>
Dan Kohn <dan@dankohn.com> Dan Kohn <dan@dankohn.com>
Timothy J Fontaine <tjfontaine@gmail.com>

13
ChangeLog
View File

@ -1,4 +1,15 @@
2013.02.15, Version 0.8.20 (Stable) 2013.02.25, Version 0.8.21 (Stable)
* http: Do not free the wrong parser on socket close (isaacs)
* http: Handle hangup writes more gently (isaacs)
* zlib: fix assert on bad input (Ben Noordhuis)
* test: add TAP output to the test runner (Timothy J Fontaine)
2013.02.15, Version 0.8.20 (Stable), e10c75579b536581ddd7ae4e2c3bf8a9d550d343
* npm: Upgrade to v1.2.11 * npm: Upgrade to v1.2.11

4
deps/uv/gyp_uv vendored
View File

@ -22,7 +22,9 @@ def compiler_version():
proc = subprocess.Popen(CC.split() + ['--version'], stdout=subprocess.PIPE) proc = subprocess.Popen(CC.split() + ['--version'], stdout=subprocess.PIPE)
is_clang = 'clang' in proc.communicate()[0].split('\n')[0] is_clang = 'clang' in proc.communicate()[0].split('\n')[0]
proc = subprocess.Popen(CC.split() + ['-dumpversion'], stdout=subprocess.PIPE) 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) return (version, is_clang)

7
deps/uv/src/unix/pipe.c vendored
View File

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

2
src/node_version.h
View File

@ -30,7 +30,7 @@
# define NODE_TAG "" # define NODE_TAG ""
#endif #endif
#define NODE_VERSION_IS_RELEASE 0 #define NODE_VERSION_IS_RELEASE 1
#ifndef NODE_STRINGIFY #ifndef NODE_STRINGIFY
#define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n) #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)