Skip to content

Commit 88686aa

Browse files
committed
http: Remove legacy ECONNRESET workaround code
Fix #5179
1 parent d46ebff commit 88686aa

2 files changed

Lines changed: 55 additions & 17 deletions

File tree

lib/http.js

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -514,23 +514,7 @@ OutgoingMessage.prototype._writeRaw = function(data, encoding) {
514514
return this.connection.write(data, encoding);
515515
} else if (this.connection && this.connection.destroyed) {
516516
// The socket was destroyed. If we're still trying to write to it,
517-
// then something bad happened, but it could be just that we haven't
518-
// gotten the 'close' event yet.
519-
//
520-
// In v0.10 and later, this isn't a problem, since ECONNRESET isn't
521-
// ignored in the first place. We'll probably emit 'close' on the
522-
// next tick, but just in case it's not coming, set a timeout that
523-
// will emit it for us.
524-
if (!this._hangupClose) {
525-
this._hangupClose = true;
526-
var socket = this.socket;
527-
var timer = setTimeout(function() {
528-
socket.emit('close');
529-
});
530-
socket.once('close', function() {
531-
clearTimeout(timer);
532-
});
533-
}
517+
// then we haven't gotten the 'close' event yet.
534518
return false;
535519
} else {
536520
// buffer, as long as we're not destroyed.
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
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+
25+
// no warnings should happen!
26+
var trace = console.trace;
27+
console.trace = function() {
28+
trace.apply(console, arguments);
29+
throw new Error('no tracing should happen here');
30+
};
31+
32+
var http = require('http');
33+
var net = require('net');
34+
35+
var server = http.createServer(function(req, res) {
36+
res.end('ok');
37+
38+
// Oh no! The connection died!
39+
req.socket.destroy();
40+
});
41+
42+
server.listen(common.PORT);
43+
44+
var client = net.connect({ port: common.PORT, allowHalfOpen: true });
45+
for (var i = 0; i < 20; i++) {
46+
client.write('GET / HTTP/1.1\r\n' +
47+
'Host: some.host.name\r\n'+
48+
'\r\n\r\n');
49+
}
50+
client.end();
51+
client.on('connect', function() {
52+
server.close();
53+
});
54+
client.pipe(process.stdout);

0 commit comments

Comments
 (0)