From 93639a080c22974b71e5f9992c6b7c976035587f Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 17 Sep 2015 15:12:15 +0800
Subject: [PATCH 1/4] spec: setImmediate should work in forked scripts

---
 spec/fixtures/module/set-immediate.js | 11 +++++++++++
 spec/node-spec.coffee                 |  7 +++++++
 2 files changed, 18 insertions(+)
 create mode 100644 spec/fixtures/module/set-immediate.js

diff --git a/spec/fixtures/module/set-immediate.js b/spec/fixtures/module/set-immediate.js
new file mode 100644
index 000000000000..e7d44a75d1fe
--- /dev/null
+++ b/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);
+  });
+});
diff --git a/spec/node-spec.coffee b/spec/node-spec.coffee
index 94174c38b743..f998a8c5b7b2 100644
--- a/spec/node-spec.coffee
+++ b/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) ->

From 5604655d547b13532efcf1aeb36863f4f57e90cf Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 17 Sep 2015 16:06:19 +0800
Subject: [PATCH 2/4] spec: vm.createContext should not crash

---
 spec/node-spec.coffee | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/node-spec.coffee b/spec/node-spec.coffee
index f998a8c5b7b2..c8d569e01ada 100644
--- a/spec/node-spec.coffee
+++ b/spec/node-spec.coffee
@@ -148,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('')

From 2be6bdcf4a0c6927f4e7e32f754072ca6eab2d5c Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 17 Sep 2015 16:06:35 +0800
Subject: [PATCH 3/4] Update to node v4.1.0

---
 vendor/node | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/node b/vendor/node
index 4098d45fbb82..aa9c7a2316ba 160000
--- a/vendor/node
+++ b/vendor/node
@@ -1 +1 @@
-Subproject commit 4098d45fbb822370c19d2fe7b88162759db4eb96
+Subproject commit aa9c7a2316ba7762f1d04d091585695be3e6be22

From d28789b5098ad9797b888c804da026487c380a58 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 17 Sep 2015 16:11:14 +0800
Subject: [PATCH 4/4] Change version to v0.32.4

This makes sure the native modules are built against the headers of
v0.32.4, since Node.js v4.1.0 has bumped the module version.
---
 atom.gyp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/atom.gyp b/atom.gyp
index 63defa4273fd..b49f3ac64bdd 100644
--- a/atom.gyp
+++ b/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',