Merge remote-tracking branch 'upstream/v0.10'

Conflicts:
	lib/_stream_writable.js

2 files changed, 54 insertions, 1 deletions

diff --git a/lib/_stream_writable.js b/lib/_stream_writable.js
index 38a07b290..3ff8b5f94 100644
--- a/lib/_stream_writable.js
+++ b/lib/_stream_writable.js
@@ -116,7 +116,7 @@ function WritableState(options, stream) {
   // This is relevant for synchronous Transform streams
   this.prefinished = false;
 
-  // Internal, used in net.js and _tls_wrap.js
+  // True if the error was already emitted and should not be thrown again
   this.errorEmitted = false;
 }
 
diff --git a/test/simple/test-net-error-twice.js b/test/simple/test-net-error-twice.js
new file mode 100644
index 000000000..5ab370eb3
--- /dev/null
+++ b/test/simple/test-net-error-twice.js
@@ -0,0 +1,53 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common');
+var assert = require('assert');
+var net = require('net');
+
+var buf = new Buffer(2 * 1024 * 1024);
+
+buf.fill(0x62);
+
+var errs = [];
+
+var srv = net.createServer(function onConnection(conn) {
+  conn.write(buf);
+  conn.on('error', function (err) {
+    errs.push(err);
+    if (errs.length > 1 && errs[0] === errs[1])
+      assert(false, "We should not be emitting the same error twice");
+  });
+  conn.on('close', function() {
+    srv.unref();
+  });
+}).listen(common.PORT, function () {
+  var client = net.connect({ port: common.PORT });
+
+  client.on('connect', function () {
+    client.destroy();
+  });
+});
+
+process.on('exit', function() {
+  console.log(errs);
+  assert.equal(errs.length, 1);
+});