From e17da272f48defda24523119959b8022c27e3566 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 5 Sep 2013 09:47:32 +0800
Subject: [PATCH] Make child_process.fork work when options.env is set.

---
 spec/node/child_process.coffee | 9 +++++++++
 vendor/node                    | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/spec/node/child_process.coffee b/spec/node/child_process.coffee
index fdffb1058abb..6d0c1dbe5e95 100644
--- a/spec/node/child_process.coffee
+++ b/spec/node/child_process.coffee
@@ -19,3 +19,12 @@ describe 'child_process', ->
         assert.equal msg, 'message'
         done()
       child.send 'message'
+
+    it 'should work in forked process when options.env is specifed', (done) ->
+      child = child_process.fork path.join(fixtures, 'module', 'fork_ping.js'),
+                                 [],
+                                 env: {test: 'somevar'}
+      child.on 'message', (msg) ->
+        assert.equal msg, 'message'
+        done()
+      child.send 'message'
diff --git a/vendor/node b/vendor/node
index 9fc97854c939..c2ecf615ac2b 160000
--- a/vendor/node
+++ b/vendor/node
@@ -1 +1 @@
-Subproject commit 9fc97854c9395edea096464edfb1e0a3b68145fe
+Subproject commit c2ecf615ac2bb846a38ffa0b64e9ce0ff4f8953b