diff options
author | isaacs <i@izs.me> | 2013-04-02 02:46:51 +0400 |
---|---|---|
committer | isaacs <i@izs.me> | 2013-04-03 21:18:42 +0400 |
commit | 88686aa4106499a603365b887e2381b55c61c027 (patch) | |
tree | 1650b1088204f8ec20b37560c15abd058d24d3d2 | |
parent | d46ebffb66edea43d17f4a9799ccd9dba21c4000 (diff) |
http: Remove legacy ECONNRESET workaround code
Fix #5179
-rw-r--r-- | lib/http.js | 18 | ||||
-rw-r--r-- | test/simple/test-http-many-ended-pipelines.js | 54 |
2 files changed, 55 insertions, 17 deletions
diff --git a/lib/http.js b/lib/http.js index 1f4db7a6475..b4fc2add113 100644 --- a/lib/http.js +++ b/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. diff --git a/test/simple/test-http-many-ended-pipelines.js b/test/simple/test-http-many-ended-pipelines.js new file mode 100644 index 00000000000..0d625be12ea --- /dev/null +++ b/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); |