Skip to content

Commit d58c206

Browse files
committed
Merge remote-tracking branch 'upstream/v0.10'
Conflicts: lib/_stream_writable.js
2 parents e2a1d9a + dee5270 commit d58c206

File tree

2 files changed

+54
-1
lines changed

2 files changed

+54
-1
lines changed

lib/_stream_writable.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ function WritableState(options, stream) {
116116
// This is relevant for synchronous Transform streams
117117
this.prefinished = false;
118118

119-
// Internal, used in net.js and _tls_wrap.js
119+
// True if the error was already emitted and should not be thrown again
120120
this.errorEmitted = false;
121121
}
122122

test/simple/test-net-error-twice.js

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
// Copyright Joyent, Inc. and other Node contributors.
2+
//
3+
// Permission is hereby granted, free of charge, to any person obtaining a
4+
// copy of this software and associated documentation files (the
5+
// "Software"), to deal in the Software without restriction, including
6+
// without limitation the rights to use, copy, modify, merge, publish,
7+
// distribute, sublicense, and/or sell copies of the Software, and to permit
8+
// persons to whom the Software is furnished to do so, subject to the
9+
// following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included
12+
// in all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
17+
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
18+
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
19+
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
20+
// USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
22+
var common = require('../common');
23+
var assert = require('assert');
24+
var net = require('net');
25+
26+
var buf = new Buffer(2 * 1024 * 1024);
27+
28+
buf.fill(0x62);
29+
30+
var errs = [];
31+
32+
var srv = net.createServer(function onConnection(conn) {
33+
conn.write(buf);
34+
conn.on('error', function (err) {
35+
errs.push(err);
36+
if (errs.length > 1 && errs[0] === errs[1])
37+
assert(false, "We should not be emitting the same error twice");
38+
});
39+
conn.on('close', function() {
40+
srv.unref();
41+
});
42+
}).listen(common.PORT, function () {
43+
var client = net.connect({ port: common.PORT });
44+
45+
client.on('connect', function () {
46+
client.destroy();
47+
});
48+
});
49+
50+
process.on('exit', function() {
51+
console.log(errs);
52+
assert.equal(errs.length, 1);
53+
});

0 commit comments

Comments
 (0)