Skip to content
Browse files

http: Remove legacy ECONNRESET workaround code

Fix #5179
  • Loading branch information...
1 parent 38106da commit feceb26a599be7c2249bc168210c5b167427bae7 @isaacs committed Apr 1, 2013
Showing with 55 additions and 17 deletions.
  1. +1 −17 lib/http.js
  2. +54 −0 test/simple/test-http-many-ended-pipelines.js
View
18 lib/http.js
@@ -514,23 +514,7 @@ OutgoingMessage.prototype._writeRaw = function(data, encoding) {
return this.connection.write(data, encoding);
} else if (this.connection && this.connection.destroyed) {
// The socket was destroyed. If we're still trying to write to it,
- // then something bad happened, but it could be just that we haven't
- // gotten the 'close' event yet.
- //
- // In v0.10 and later, this isn't a problem, since ECONNRESET isn't
- // ignored in the first place. We'll probably emit 'close' on the
- // next tick, but just in case it's not coming, set a timeout that
- // will emit it for us.
- if (!this._hangupClose) {
- this._hangupClose = true;
- var socket = this.socket;
- var timer = setTimeout(function() {
- socket.emit('close');
- });
- socket.once('close', function() {
- clearTimeout(timer);
- });
- }
+ // then we haven't gotten the 'close' event yet.
return false;
} else {
// buffer, as long as we're not destroyed.
View
54 test/simple/test-http-many-ended-pipelines.js
@@ -0,0 +1,54 @@
+// 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');
+
+// no warnings should happen!
+var trace = console.trace;
+console.trace = function() {
+ trace.apply(console, arguments);
+ throw new Error('no tracing should happen here');
+};
+
+var http = require('http');
+var net = require('net');
+
+var server = http.createServer(function(req, res) {
+ res.end('ok');
+
+ // Oh no! The connection died!
+ req.socket.destroy();
+});
+
+server.listen(common.PORT);
+
+var client = net.connect({ port: common.PORT, allowHalfOpen: true });
+for (var i = 0; i < 20; i++) {
+ client.write('GET / HTTP/1.1\r\n' +
+ 'Host: some.host.name\r\n'+
+ '\r\n\r\n');
+}
+client.end();
+client.on('connect', function() {
+ server.close();
+});
+client.pipe(process.stdout);

0 comments on commit feceb26

Please sign in to comment.
Something went wrong with that request. Please try again.