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

Conflicts: AUTHORS
nodejs · Jul 9, 2012 · 9547ee9 · 9547ee9
2 parents 6530310 + cc6084b
commit 9547ee9
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 5 deletions.
diff --git 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
@@ -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)

diff --git 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');
-}
+  var re = /test[\/\\]fixtures[\/\\]invalid.json: Unexpected string/;
+  var i = err.message.match(re);
+  assert(null !== i, 'require() json error should include path');
+}