From c4e9226bdb5ce00fbe8a8b2dcb4ac4ebfe5de119 Mon Sep 17 00:00:00 2001 From: isaacs Date: Sat, 7 Jul 2012 15:01:51 -0700 Subject: [PATCH 1/2] Fix test-require-json on Windows --- test/simple/test-require-json.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/simple/test-require-json.js b/test/simple/test-require-json.js index 027cae6798..59b1e3d61f 100644 --- a/test/simple/test-require-json.js +++ b/test/simple/test-require-json.js @@ -24,6 +24,7 @@ var assert = require('assert'); try { require('../fixtures/invalid.json'); } catch (err) { - var i = err.message.indexOf('test/fixtures/invalid.json: Unexpected string') - assert(-1 != i, 'require() json error should include path'); -} \ No newline at end of file + var re = /test[\/\\]fixtures[\/\\]invalid.json: Unexpected string/; + var i = err.message.match(re); + assert(null !== i, 'require() json error should include path'); +} From cc6084b9ac5cf1d4fe5e7165b71e8fc05d11be1f Mon Sep 17 00:00:00 2001 From: isaacs Date: Sat, 7 Jul 2012 13:56:39 -0700 Subject: [PATCH 2/2] 2012.07.09, Version 0.8.2 (Stable) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * npm: Upgrade to 1.1.36 * readline: don't use Function#call() (Nathan Rajlich) * Code cleanup to pass 'use strict' (Jonas Westerlund) * module: add filename to require() json errors (TJ Holowaychuk) * readline: fix for unicode prompts (Tim Macfarlane) * timers: fix handling of large timeouts (Ben Noordhuis) * repl: fix passing an empty line inserting "undefined" into the buffer (Nathan Rajlich) * repl: fix crashes when buffering command (Maciej Małecki) * build: rename strict_aliasing to node_no_strict_aliasing (Ben Noordhuis) * build: disable -fstrict-aliasing for any gcc < 4.6.0 (Ben Noordhuis) * build: detect cc version with -dumpversion (Ben Noordhuis) * build: handle output of localized gcc or clang (Ben Noordhuis) * unix: fix memory corruption in freebsd.c (Ben Noordhuis) * unix: fix 'zero handles, one request' busy loop (Ben Noordhuis) * unix: fix busy loop on unexpected tcp message (Ben Noordhuis) * unix: fix EINPROGRESS busy loop (Ben Noordhuis) --- AUTHORS | 3 +++ ChangeLog | 37 ++++++++++++++++++++++++++++++++++++- src/node_version.h | 2 +- 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index a389d07ce4..df31d0212b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -322,3 +322,6 @@ Nuno Job Ben Kelly Felix Böhm Gabriel de Perthuis +Tim Macfarlane +Jonas Westerlund +Dominic Tarr diff --git a/ChangeLog b/ChangeLog index 03a7fdca0b..42e81cec4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,39 @@ -2012.06.29, Version 0.8.1 (stable) +2012.07.09, Version 0.8.2 (Stable) + +* npm: Upgrade to 1.1.36 + +* readline: don't use Function#call() (Nathan Rajlich) + +* Code cleanup to pass 'use strict' (Jonas Westerlund) + +* module: add filename to require() json errors (TJ Holowaychuk) + +* readline: fix for unicode prompts (Tim Macfarlane) + +* timers: fix handling of large timeouts (Ben Noordhuis) + +* repl: fix passing an empty line inserting "undefined" into the buffer (Nathan Rajlich) + +* repl: fix crashes when buffering command (Maciej Małecki) + +* build: rename strict_aliasing to node_no_strict_aliasing (Ben Noordhuis) + +* build: disable -fstrict-aliasing for any gcc < 4.6.0 (Ben Noordhuis) + +* build: detect cc version with -dumpversion (Ben Noordhuis) + +* build: handle output of localized gcc or clang (Ben Noordhuis) + +* unix: fix memory corruption in freebsd.c (Ben Noordhuis) + +* unix: fix 'zero handles, one request' busy loop (Ben Noordhuis) + +* unix: fix busy loop on unexpected tcp message (Ben Noordhuis) + +* unix: fix EINPROGRESS busy loop (Ben Noordhuis) + + +2012.06.29, Version 0.8.1 (stable), 2134aa3d5c622fc3c3b02ccb713fcde0e0df479a * V8: upgrade to v3.11.10.12 diff --git a/src/node_version.h b/src/node_version.h index 28cacb83d6..6f78d7b020 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -25,7 +25,7 @@ #define NODE_MAJOR_VERSION 0 #define NODE_MINOR_VERSION 8 #define NODE_PATCH_VERSION 2 -#define NODE_VERSION_IS_RELEASE 0 +#define NODE_VERSION_IS_RELEASE 1 #ifndef NODE_STRINGIFY #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)