Merge pull request #2817 from atom/fix-set-immediate

Update to node v4.1.0

atom.gyp

@@ -4,7 +4,7 @@
     'product_name%': 'Electron',
     'company_name%': 'GitHub, Inc',
     'company_abbr%': 'github',
-    'version%': '0.32.3',
+    'version%': '0.32.4',
   },
   'includes': [
     'filenames.gypi',

spec/fixtures/module/set-immediate.js

@@ -0,0 +1,11 @@
+process.on('uncaughtException', function(error) {
+  process.send(error.message);
+  process.exit(1);
+});
+
+process.on('message', function(msg) {
+  setImmediate(function() {
+    process.send('ok');
+    process.exit(0);
+  });
+});

spec/node-spec.coffee

@@ -56,6 +56,13 @@ describe 'node feature', ->
           done()
         child.send 'message'
 
+      it 'has setImmediate working in script', (done) ->
+        child = child_process.fork path.join(fixtures, 'module', 'set-immediate.js')
+        child.on 'message', (msg) ->
+          assert.equal msg, 'ok'
+          done()
+        child.send 'message'
+
   describe 'contexts', ->
     describe 'setTimeout in fs callback', ->
       it 'does not crash', (done) ->
@@ -141,3 +148,7 @@ describe 'node feature', ->
     # Not reliable on some machines
     xit 'should have isTTY defined', ->
       assert.equal typeof(process.stdout.isTTY), 'boolean'
+
+  describe 'vm.createContext', ->
+    it 'should not crash', ->
+      require('vm').runInNewContext('')

vendor/node

@@ -1 +1 @@
-Subproject commit 4098d45fbb822370c19d2fe7b88162759db4eb96
+Subproject commit aa9c7a2316ba7762f1d04d091585695be3e6be22