From 7a1a62ec6e168876493688cfa45097567a332267 Mon Sep 17 00:00:00 2001 From: isaacs Date: Thu, 16 Feb 2012 14:52:03 -0800 Subject: [PATCH 1/5] Upgrade uv to 86ebe48660e --- deps/uv/include/uv-private/uv-win.h | 2 +- deps/uv/src/unix/tty.c | 4 +- deps/uv/src/win/error.c | 8 ++- deps/uv/src/win/fs.c | 83 +++++++++++++++-------------- deps/uv/test/test-fs.c | 2 +- 5 files changed, 53 insertions(+), 46 deletions(-) diff --git a/deps/uv/include/uv-private/uv-win.h b/deps/uv/include/uv-private/uv-win.h index ea770132dd..e620f8b084 100644 --- a/deps/uv/include/uv-private/uv-win.h +++ b/deps/uv/include/uv-private/uv-win.h @@ -388,7 +388,7 @@ RB_HEAD(uv_timer_tree_s, uv_timer_s); #define UV_FS_PRIVATE_FIELDS \ wchar_t* pathw; \ int flags; \ - int last_error; \ + DWORD sys_errno_; \ struct _stati64 stat; \ void* arg0; \ union { \ diff --git a/deps/uv/src/unix/tty.c b/deps/uv/src/unix/tty.c index 18a892168f..c1429660eb 100644 --- a/deps/uv/src/unix/tty.c +++ b/deps/uv/src/unix/tty.c @@ -76,8 +76,8 @@ int uv_tty_set_mode(uv_tty_t* tty, int mode) { raw.c_cc[VMIN] = 1; raw.c_cc[VTIME] = 0; - /* Put terminal in raw mode after flushing */ - if (tcsetattr(fd, TCSAFLUSH, &raw)) { + /* Put terminal in raw mode after draining */ + if (tcsetattr(fd, TCSADRAIN, &raw)) { goto fatal; } diff --git a/deps/uv/src/win/error.c b/deps/uv/src/win/error.c index dd0018daa6..1922f2039b 100644 --- a/deps/uv/src/win/error.c +++ b/deps/uv/src/win/error.c @@ -84,6 +84,8 @@ uv_err_code uv_translate_sys_error(int sys_errno) { case WSAECONNREFUSED: return UV_ECONNREFUSED; case ERROR_NETNAME_DELETED: return UV_ECONNRESET; case WSAECONNRESET: return UV_ECONNRESET; + case ERROR_ALREADY_EXISTS: return UV_EEXIST; + case ERROR_FILE_EXISTS: return UV_EEXIST; case WSAEFAULT: return UV_EFAULT; case ERROR_HOST_UNREACHABLE: return UV_EHOSTUNREACH; case WSAEHOSTUNREACH: return UV_EHOSTUNREACH; @@ -93,6 +95,7 @@ uv_err_code uv_translate_sys_error(int sys_errno) { case ERROR_TOO_MANY_OPEN_FILES: return UV_EMFILE; case WSAEMFILE: return UV_EMFILE; case WSAEMSGSIZE: return UV_EMSGSIZE; + case ERROR_FILENAME_EXCED_RANGE: return UV_ENAMETOOLONG; case ERROR_NETWORK_UNREACHABLE: return UV_ENETUNREACH; case WSAENETUNREACH: return UV_ENETUNREACH; case WSAENOBUFS: return UV_ENOBUFS; @@ -105,9 +108,12 @@ uv_err_code uv_translate_sys_error(int sys_errno) { case ERROR_INVALID_PARAMETER: return UV_EINVAL; case ERROR_NO_UNICODE_TRANSLATION: return UV_ECHARSET; case ERROR_BROKEN_PIPE: return UV_EOF; + case ERROR_BAD_PIPE: return UV_EPIPE; + case ERROR_NO_DATA: return UV_EPIPE; + case ERROR_PIPE_NOT_CONNECTED: return UV_EPIPE; case ERROR_PIPE_BUSY: return UV_EBUSY; case ERROR_SEM_TIMEOUT: return UV_ETIMEDOUT; - case ERROR_ALREADY_EXISTS: return UV_EEXIST; + case WSAETIMEDOUT: return UV_ETIMEDOUT; case WSAHOST_NOT_FOUND: return UV_ENOENT; default: return UV_UNKNOWN; } diff --git a/deps/uv/src/win/fs.c b/deps/uv/src/win/fs.c index 12ad514c48..94da291930 100644 --- a/deps/uv/src/win/fs.c +++ b/deps/uv/src/win/fs.c @@ -38,7 +38,6 @@ #define UV_FS_FREE_ARG1 0x0004 #define UV_FS_FREE_PTR 0x0008 #define UV_FS_CLEANEDUP 0x0010 -#define UV_FS_LAST_ERROR_SET 0x0020 #define UTF8_TO_UTF16(s, t) \ @@ -88,33 +87,30 @@ uv_ref((loop)); #define SET_UV_LAST_ERROR_FROM_REQ(req) \ - if (req->flags & UV_FS_LAST_ERROR_SET) { \ - uv__set_sys_error(req->loop, req->last_error); \ - } else if (req->result == -1) { \ - uv__set_error(req->loop, (uv_err_code)req->errorno, req->last_error); \ - } - -#define SET_REQ_LAST_ERROR(req, error) \ - req->last_error = error; \ - req->flags |= UV_FS_LAST_ERROR_SET; + uv__set_error(req->loop, req->errorno, req->sys_errno_); #define SET_REQ_RESULT(req, result_value) \ req->result = (result_value); \ if (req->result == -1) { \ - req->last_error = _doserrno; \ - req->errorno = uv_translate_sys_error(req->last_error); \ + req->sys_errno_ = _doserrno; \ + req->errorno = uv_translate_sys_error(req->sys_errno_); \ } -#define SET_REQ_RESULT_WIN32_ERROR(req, sys_errno) \ +#define SET_REQ_WIN32_ERROR(req, sys_errno) \ + req->result = -1; \ + req->sys_errno_ = (sys_errno); \ + req->errorno = uv_translate_sys_error(req->sys_errno_); + +#define SET_REQ_UV_ERROR(req, uv_errno, sys_errno) \ req->result = -1; \ - req->errorno = uv_translate_sys_error(sys_errno); \ - SET_REQ_LAST_ERROR(req, sys_errno); + req->sys_errno_ = (sys_errno); \ + req->errorno = (uv_errno); #define VERIFY_UV_FILE(file, req) \ if (file == -1) { \ req->result = -1; \ req->errorno = UV_EBADF; \ - req->last_error = ERROR_SUCCESS; \ + req->sys_errno_ = ERROR_SUCCESS; \ return; \ } @@ -137,7 +133,7 @@ static void uv_fs_req_init_async(uv_loop_t* loop, uv_fs_t* req, req->path = path ? strdup(path) : NULL; req->pathw = (wchar_t*)pathw; req->errorno = 0; - req->last_error = 0; + req->sys_errno_ = 0; memset(&req->overlapped, 0, sizeof(req->overlapped)); } @@ -266,7 +262,15 @@ void fs__open(uv_fs_t* req, const wchar_t* path, int flags, int mode) { attributes, NULL); if (file == INVALID_HANDLE_VALUE) { - SET_REQ_RESULT_WIN32_ERROR(req, GetLastError()); + DWORD error = GetLastError(); + if (error == ERROR_FILE_EXISTS && (flags & _O_CREAT) && + !(flags & _O_EXCL)) { + /* Special case: when ERROR_FILE_EXISTS happens and O_CREAT was */ + /* specified, it means the path referred to a directory. */ + SET_REQ_UV_ERROR(req, UV_EISDIR, error); + } else { + SET_REQ_WIN32_ERROR(req, GetLastError()); + } return; } result = _open_osfhandle((intptr_t)file, flags); @@ -300,7 +304,7 @@ void fs__read(uv_fs_t* req, uv_file file, void *buf, size_t length, } if (length > INT_MAX) { - SET_REQ_ERROR(req, ERROR_INSUFFICIENT_BUFFER); + SET_REQ_WIN32_ERROR(req, ERROR_INSUFFICIENT_BUFFER); return; } @@ -319,7 +323,7 @@ void fs__read(uv_fs_t* req, uv_file file, void *buf, size_t length, if (ReadFile(handle, buf, length, &bytes, overlapped_ptr)) { SET_REQ_RESULT(req, bytes); } else { - SET_REQ_ERROR(req, GetLastError()); + SET_REQ_WIN32_ERROR(req, GetLastError()); } } @@ -340,7 +344,7 @@ void fs__write(uv_fs_t* req, uv_file file, void *buf, size_t length, } if (length > INT_MAX) { - SET_REQ_ERROR(req, ERROR_INSUFFICIENT_BUFFER); + SET_REQ_WIN32_ERROR(req, ERROR_INSUFFICIENT_BUFFER); return; } @@ -359,7 +363,7 @@ void fs__write(uv_fs_t* req, uv_file file, void *buf, size_t length, if (WriteFile(handle, buf, length, &bytes, overlapped_ptr)) { SET_REQ_RESULT(req, bytes); } else { - SET_REQ_ERROR(req, GetLastError()); + SET_REQ_WIN32_ERROR(req, GetLastError()); } } @@ -398,7 +402,7 @@ void fs__readdir(uv_fs_t* req, const wchar_t* path, int flags) { if (!(GetFileAttributesW(path) & FILE_ATTRIBUTE_DIRECTORY)) { req->result = -1; req->errorno = UV_ENOTDIR; - req->last_error = ERROR_SUCCESS; + req->sys_errno_ = ERROR_SUCCESS; return; } @@ -416,7 +420,7 @@ void fs__readdir(uv_fs_t* req, const wchar_t* path, int flags) { free(path2); if(dir == INVALID_HANDLE_VALUE) { - SET_REQ_RESULT_WIN32_ERROR(req, GetLastError()); + SET_REQ_WIN32_ERROR(req, GetLastError()); return; } @@ -460,7 +464,7 @@ void fs__readdir(uv_fs_t* req, const wchar_t* path, int flags) { /* Convert result to UTF8. */ size = uv_utf16_to_utf8(buf, buf_char_len, NULL, 0); if (!size) { - SET_REQ_RESULT_WIN32_ERROR(req, GetLastError()); + SET_REQ_WIN32_ERROR(req, GetLastError()); return; } @@ -474,7 +478,7 @@ void fs__readdir(uv_fs_t* req, const wchar_t* path, int flags) { free(buf); free(req->ptr); req->ptr = NULL; - SET_REQ_RESULT_WIN32_ERROR(req, GetLastError()); + SET_REQ_WIN32_ERROR(req, GetLastError()); return; } free(buf); @@ -491,7 +495,6 @@ void fs__readdir(uv_fs_t* req, const wchar_t* path, int flags) { static void fs__stat(uv_fs_t* req, const wchar_t* path) { HANDLE handle; - int result; BY_HANDLE_FILE_INFORMATION info; req->ptr = NULL; @@ -504,12 +507,12 @@ static void fs__stat(uv_fs_t* req, const wchar_t* path) { FILE_FLAG_BACKUP_SEMANTICS, NULL); if (handle == INVALID_HANDLE_VALUE) { - SET_REQ_RESULT_WIN32_ERROR(req, GetLastError()); + SET_REQ_WIN32_ERROR(req, GetLastError()); return; } if (!GetFileInformationByHandle(handle, &info)) { - SET_REQ_RESULT_WIN32_ERROR(req, GetLastError()); + SET_REQ_WIN32_ERROR(req, GetLastError()); CloseHandle(handle); return; } @@ -565,7 +568,7 @@ void fs__fstat(uv_fs_t* req, uv_file file) { void fs__rename(uv_fs_t* req, const wchar_t* path, const wchar_t* new_path) { if (!MoveFileExW(path, new_path, MOVEFILE_REPLACE_EXISTING)) { - SET_REQ_RESULT_WIN32_ERROR(req, GetLastError()); + SET_REQ_WIN32_ERROR(req, GetLastError()); return; } @@ -580,7 +583,7 @@ void fs__fsync(uv_fs_t* req, uv_file file) { result = FlushFileBuffers((HANDLE)_get_osfhandle(file)) ? 0 : -1; if (result == -1) { - SET_REQ_RESULT_WIN32_ERROR(req, GetLastError()); + SET_REQ_WIN32_ERROR(req, GetLastError()); } else { SET_REQ_RESULT(req, result); } @@ -711,7 +714,7 @@ void fs__futime(uv_fs_t* req, uv_file file, double atime, double mtime) { void fs__link(uv_fs_t* req, const wchar_t* path, const wchar_t* new_path) { int result = CreateHardLinkW(new_path, path, NULL) ? 0 : -1; if (result == -1) { - SET_REQ_RESULT_WIN32_ERROR(req, GetLastError()); + SET_REQ_WIN32_ERROR(req, GetLastError()); } else { SET_REQ_RESULT(req, result); } @@ -726,13 +729,11 @@ void fs__symlink(uv_fs_t* req, const wchar_t* path, const wchar_t* new_path, path, flags & UV_FS_SYMLINK_DIR ? SYMBOLIC_LINK_FLAG_DIRECTORY : 0) ? 0 : -1; if (result == -1) { - SET_REQ_RESULT_WIN32_ERROR(req, GetLastError()); + SET_REQ_WIN32_ERROR(req, GetLastError()); return; } } else { - req->result = -1; - req->errorno = UV_ENOTSUP; - req->last_error = ERROR_SUCCESS; + SET_REQ_UV_ERROR(req, UV_ENOSYS, ERROR_NOT_SUPPORTED); return; } @@ -761,7 +762,7 @@ void fs__readlink(uv_fs_t* req, const wchar_t* path) { if (INVALID_HANDLE_VALUE == symlink) { result = -1; - SET_REQ_LAST_ERROR(req, GetLastError()); + SET_REQ_WIN32_ERROR(req, GetLastError()); goto done; } @@ -781,7 +782,7 @@ void fs__readlink(uv_fs_t* req, const wchar_t* path) { if (!rv) { result = -1; - SET_REQ_LAST_ERROR(req, GetLastError()); + SET_REQ_WIN32_ERROR(req, GetLastError()); goto done; } @@ -789,7 +790,7 @@ void fs__readlink(uv_fs_t* req, const wchar_t* path) { if (reparse_data->ReparseTag != IO_REPARSE_TAG_SYMLINK) { result = -1; /* something is seriously wrong */ - SET_REQ_LAST_ERROR(req, GetLastError()); + SET_REQ_WIN32_ERROR(req, GetLastError()); goto done; } @@ -810,7 +811,7 @@ void fs__readlink(uv_fs_t* req, const wchar_t* path) { 0); if (!utf8size) { result = -1; - SET_REQ_LAST_ERROR(req, GetLastError()); + SET_REQ_WIN32_ERROR(req, GetLastError()); goto done; } @@ -825,7 +826,7 @@ void fs__readlink(uv_fs_t* req, const wchar_t* path) { utf8size); if (!utf8size) { result = -1; - SET_REQ_LAST_ERROR(req, GetLastError()); + SET_REQ_WIN32_ERROR(req, GetLastError()); goto done; } diff --git a/deps/uv/test/test-fs.c b/deps/uv/test/test-fs.c index 006968829d..af2ebbf5bc 100644 --- a/deps/uv/test/test-fs.c +++ b/deps/uv/test/test-fs.c @@ -45,7 +45,7 @@ # define close _close #endif -#define TOO_LONG_NAME_LENGTH 8192 +#define TOO_LONG_NAME_LENGTH 65536 typedef struct { const char* path; From 4672872ddde70e079670d2a12079cb303ef41dbb Mon Sep 17 00:00:00 2001 From: isaacs Date: Fri, 17 Feb 2012 10:08:40 -0800 Subject: [PATCH 2/5] Fix #2770 Compile the OS X pkg as ia32 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2a6b70b465..1609495749 100644 --- a/Makefile +++ b/Makefile @@ -173,8 +173,8 @@ pkg: $(PKG) $(PKG): -rm -rf $(PKGDIR) - $(WAF) configure --prefix=/usr/local --without-snapshot - DESTDIR=$(PKGDIR) $(WAF) install + $(WAF) configure --prefix=/usr/local --without-snapshot --dest-cpu=ia32 + CFLAGS=-m32 DESTDIR=$(PKGDIR) $(WAF) install $(packagemaker) \ --id "org.nodejs.NodeJS-$(VERSION)" \ --doc tools/osx-pkg.pmdoc \ From a2851b62345c59ab5d41d8e3d0da1bad8a9c59d3 Mon Sep 17 00:00:00 2001 From: isaacs Date: Fri, 17 Feb 2012 10:10:02 -0800 Subject: [PATCH 3/5] Revert "cluster: propagate bind errors" This reverts commit 30e462e91937ced3847af3fe9c393ebd32294b68. --- lib/net.js | 24 ++--- test/simple/test-cluster-bind-twice-v1.js | 77 --------------- test/simple/test-cluster-bind-twice-v2.js | 115 ---------------------- 3 files changed, 6 insertions(+), 210 deletions(-) delete mode 100644 test/simple/test-cluster-bind-twice-v1.js delete mode 100644 test/simple/test-cluster-bind-twice-v2.js diff --git a/lib/net.js b/lib/net.js index a797ed6fed..e41e96ae1d 100644 --- a/lib/net.js +++ b/lib/net.js @@ -756,26 +756,14 @@ Server.prototype._listen2 = function(address, port, addressType) { function listen(self, address, port, addressType) { - if (!process.env.NODE_WORKER_ID) { + if (process.env.NODE_WORKER_ID) { + require('cluster')._getServer(address, port, addressType, function(handle) { + self._handle = handle; + self._listen2(address, port, addressType); + }); + } else { self._listen2(address, port, addressType); - return; } - - require('cluster')._getServer(address, port, addressType, function(handle) { - // OS X doesn't necessarily signal EADDRINUSE from bind(), it may defer - // the error until later. libuv mimics this behaviour to provide - // consistent behaviour across platforms but that means we could very - // well have a socket that is not actually bound... that's why we do - // this ghetto port check and raise EADDRINUSE if the requested and the - // actual port differ except if port == 0 because that means "any port". - if (port && port != handle.getsockname().port) { - self.emit('error', errnoException('EADDRINUSE', 'bind')); - return; - } - - self._handle = handle; - self._listen2(address, port, addressType); - }); } diff --git a/test/simple/test-cluster-bind-twice-v1.js b/test/simple/test-cluster-bind-twice-v1.js deleted file mode 100644 index 068842fa53..0000000000 --- a/test/simple/test-cluster-bind-twice-v1.js +++ /dev/null @@ -1,77 +0,0 @@ -// Copyright Joyent, Inc. and other Node contributors. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to permit -// persons to whom the Software is furnished to do so, subject to the -// following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -// USE OR OTHER DEALINGS IN THE SOFTWARE. - -// This test starts two clustered HTTP servers on the same port. It expects the -// first cluster to succeed and the second cluster to fail with EADDRINUSE. - -var common = require('../common'); -var assert = require('assert'); -var cluster = require('cluster'); -var fork = require('child_process').fork; -var http = require('http'); - -var id = process.argv[2]; - -if (!id) { - var a = fork(__filename, ['one']); - var b = fork(__filename, ['two']); - - a.on('message', function(m) { - assert.equal(m, 'READY'); - b.send('START'); - }); - - var ok = false; - - b.on('message', function(m) { - assert.equal(m, 'EADDRINUSE'); - a.kill(); - b.kill(); - ok = true; - }); - - process.on('exit', function() { - a.kill(); - b.kill(); - assert(ok); - }); -} -else if (id === 'one') { - if (cluster.isMaster) cluster.fork(); - http.createServer(assert.fail).listen(common.PORT, function() { - process.send('READY'); - }); -} -else if (id === 'two') { - if (cluster.isMaster) cluster.fork(); - process.on('message', function(m) { - assert.equal(m, 'START'); - var server = http.createServer(assert.fail); - server.listen(common.PORT, assert.fail); - server.on('error', function(e) { - assert.equal(e.code, 'EADDRINUSE'); - process.send(e.code); - }); - }); -} -else { - assert(0); // bad command line argument -} diff --git a/test/simple/test-cluster-bind-twice-v2.js b/test/simple/test-cluster-bind-twice-v2.js deleted file mode 100644 index 1842cce260..0000000000 --- a/test/simple/test-cluster-bind-twice-v2.js +++ /dev/null @@ -1,115 +0,0 @@ -// Copyright Joyent, Inc. and other Node contributors. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to permit -// persons to whom the Software is furnished to do so, subject to the -// following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -// USE OR OTHER DEALINGS IN THE SOFTWARE. - -// This test starts two clustered HTTP servers on the same port. It expects the -// first cluster to succeed and the second cluster to fail with EADDRINUSE. -// -// The test may seem complex but most of it is plumbing that routes messages -// from the child processes back to the "super" master. As a tree it looks -// something like this: -// -// -// / \ -// -// / \ -// -// -// The first worker starts a server on a fixed port and fires a ready message -// that is routed to the second worker. When it tries to bind, it expects to -// see an EADDRINUSE error. -// -// See https://github.com/joyent/node/issues/2721 for more details. - -var common = require('../common'); -var assert = require('assert'); -var cluster = require('cluster'); -var fork = require('child_process').fork; -var http = require('http'); - -var id = process.argv[2]; - -if (!id) { - var a = fork(__filename, ['one']); - var b = fork(__filename, ['two']); - - a.on('message', function(m) { - if (typeof m === 'object') return; - assert.equal(m, 'READY'); - b.send('START'); - }); - - var ok = false; - - b.on('message', function(m) { - if (typeof m === 'object') return; // ignore system messages - assert.equal(m, 'EADDRINUSE'); - a.kill(); - b.kill(); - ok = true; - }); - - process.on('exit', function() { - a.kill(); - b.kill(); - assert(ok); - }); -} -else if (id === 'one') { - if (cluster.isMaster) return startWorker(); - - http.createServer(assert.fail).listen(common.PORT, function() { - process.send('READY'); - }); -} -else if (id === 'two') { - if (cluster.isMaster) return startWorker(); - - var ok = false; - process.on('SIGTERM', process.exit); - process.on('exit', function() { - assert(ok); - }); - - process.on('message', function(m) { - if (typeof m === 'object') return; // ignore system messages - assert.equal(m, 'START'); - var server = http.createServer(assert.fail); - server.listen(common.PORT, assert.fail); - server.on('error', function(e) { - assert.equal(e.code, 'EADDRINUSE'); - process.send(e.code); - ok = true; - }); - }); -} -else { - assert(0); // bad command line argument -} - -function startWorker() { - var worker = cluster.fork(); - worker.on('message', process.send); - process.on('message', worker.send.bind(worker)); - process.on('SIGTERM', function() { - worker.kill(); - process.exit(); - }); -} From 1eb1fe32250fc88cb5b0a97cddf3e02be02e3f4a Mon Sep 17 00:00:00 2001 From: isaacs Date: Thu, 16 Feb 2012 16:04:34 -0800 Subject: [PATCH 4/5] 2012.02.17 Version 0.6.11 (stable) * http: allow multiple WebSocket RFC6455 headers (Einar Otto Stangvik) * http: allow multiple WWW-Authenticate headers (Ben Noordhuis) * windows: support unicode argv and environment variables (Bert Belder) * tls: mitigate session renegotiation attacks (Ben Noordhuis) * tcp, pipe: don't assert on uv_accept() errors (Ben Noordhuis) * tls: Allow establishing secure connection on the existing socket (koichik) * dgram: handle close of dgram socket before DNS lookup completes (Seth Fitzsimmons) * windows: Support half-duplex pipes (Igor Zinkovsky) * build: disable omit-frame-pointer on solaris systems (Dave Pacheco) * debugger: fix --debug-brk (Ben Noordhuis) * net: fix large file downloads failing (koichik) * fs: fix ReadStream failure to read from existing fd (Christopher Jeffrey) * net: destroy socket on DNS error (Stefan Rusu) * dtrace: add missing translator (Dave Pacheco) * unix: don't flush tty on switch to raw mode (Ben Noordhuis) * windows: reset brightness when reverting to default text color (Bert Belder) * npm: update to 1.1.1 - Update which, fstream, mkdirp, request, and rimraf - Fix #2123 Set path properly for lifecycle scripts on windows - Mark the root as seen, so we don't recurse into it. Fixes #1838. (Martin Cooper) --- AUTHORS | 5 +++++ ChangeLog | 42 +++++++++++++++++++++++++++++++++++++++- doc/about/index.html | 2 +- doc/community/index.html | 2 +- doc/index.html | 18 ++++++++--------- doc/logos/index.html | 2 +- doc/template.html | 6 +++--- src/node_version.h | 2 +- 8 files changed, 62 insertions(+), 17 deletions(-) diff --git a/AUTHORS b/AUTHORS index 9c2969a614..3afd5f597b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -261,3 +261,8 @@ Brandon Benvie Nicolas LaCasse Dan VerWeire Matthew Fitzsimmons +Paddy Byers +Philip Tellis +Christopher Jeffrey +Seth Fitzsimmons +Einar Otto Stangvik diff --git a/ChangeLog b/ChangeLog index b778f6cb61..f4b5fc56f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,44 @@ -2012.02.02, Version 0.6.10 (stable) +2012.02.17 Version 0.6.11 (stable) + +* http: allow multiple WebSocket RFC6455 headers (Einar Otto Stangvik) + +* http: allow multiple WWW-Authenticate headers (Ben Noordhuis) + +* windows: support unicode argv and environment variables (Bert Belder) + +* tls: mitigate session renegotiation attacks (Ben Noordhuis) + +* tcp, pipe: don't assert on uv_accept() errors (Ben Noordhuis) + +* tls: Allow establishing secure connection on the existing socket (koichik) + +* dgram: handle close of dgram socket before DNS lookup completes (Seth Fitzsimmons) + +* windows: Support half-duplex pipes (Igor Zinkovsky) + +* build: disable omit-frame-pointer on solaris systems (Dave Pacheco) + +* debugger: fix --debug-brk (Ben Noordhuis) + +* net: fix large file downloads failing (koichik) + +* fs: fix ReadStream failure to read from existing fd (Christopher Jeffrey) + +* net: destroy socket on DNS error (Stefan Rusu) + +* dtrace: add missing translator (Dave Pacheco) + +* unix: don't flush tty on switch to raw mode (Ben Noordhuis) + +* windows: reset brightness when reverting to default text color (Bert Belder) + +* npm: update to 1.1.1 + - Update which, fstream, mkdirp, request, and rimraf + - Fix #2123 Set path properly for lifecycle scripts on windows + - Mark the root as seen, so we don't recurse into it. Fixes #1838. (Martin Cooper) + + +2012.02.02, Version 0.6.10 (stable), 051908e023f87894fa68f5b64d0b99a19a7db01e * Update V8 to 3.6.6.20 diff --git a/doc/about/index.html b/doc/about/index.html index e6d3fdb6ff..9ec091f67e 100644 --- a/doc/about/index.html +++ b/doc/about/index.html @@ -130,7 +130,7 @@ console.log('Server running at http://127.0.0.1:1337/');
    • -

    Copyright 2010 Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright 2010 Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff --git a/doc/community/index.html b/doc/community/index.html index bd15c12678..e410de25ca 100644 --- a/doc/community/index.html +++ b/doc/community/index.html @@ -180,7 +180,7 @@
    • -

    Copyright 2010 Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    +

    Copyright 2010 Joyent, Inc, Node.js is a trademark of Joyent, Inc. View license.

    diff --git a/src/node_version.h b/src/node_version.h index b1260d78a4..1cab68a50b 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -29,7 +29,7 @@ #define NODE_MAJOR_VERSION 0 #define NODE_MINOR_VERSION 6 #define NODE_PATCH_VERSION 11 -#define NODE_VERSION_IS_RELEASE 0 +#define NODE_VERSION_IS_RELEASE 1 #ifndef NODE_STRINGIFY #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n) From f73f07e1266cce36d41001297438b640cd6bb3b5 Mon Sep 17 00:00:00 2001 From: isaacs Date: Fri, 17 Feb 2012 13:33:58 -0800 Subject: [PATCH 5/5] Now working on 0.6.12 --- src/node_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/node_version.h b/src/node_version.h index 1cab68a50b..2b715b7aff 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -28,8 +28,8 @@ #define NODE_MAJOR_VERSION 0 #define NODE_MINOR_VERSION 6 -#define NODE_PATCH_VERSION 11 -#define NODE_VERSION_IS_RELEASE 1 +#define NODE_PATCH_VERSION 12 +#define NODE_VERSION_IS_RELEASE 0 #ifndef NODE_STRINGIFY #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)