From e505f91266c80d9846dd4cf2967e6f063772f24f Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Tue, 26 Feb 2013 19:38:15 +0100
Subject: [PATCH] test: merge environment, don't overwrite

The CI system requires that some environment variables are set so merge
our variables into the current environment instead of blindly replacing
it.

This will probably have to be repeated for other tests. C'est la vie.
---
 test/simple/test-http-server-stale-close.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/simple/test-http-server-stale-close.js b/test/simple/test-http-server-stale-close.js
index e8ecf318e4..aa42a049bb 100644
--- a/test/simple/test-http-server-stale-close.js
+++ b/test/simple/test-http-server-stale-close.js
@@ -22,6 +22,7 @@
 var common = require('../common');
 var assert = require('assert');
 var http = require('http');
+var util = require('util');
 var fork = require('child_process').fork;
 
 if (process.env.NODE_TEST_FORK) {
@@ -45,7 +46,7 @@ else {
   });
   server.listen(common.PORT, function() {
     fork(__filename, {
-      env: {NODE_TEST_FORK: '1'}
+      env: util._extend(process.env, {NODE_TEST_FORK: '1'})
     });
   });
 }