From 62aaf56d1bf4819bf78ecb352092b625b9a4a0ea Mon Sep 17 00:00:00 2001 From: koichik Date: Fri, 29 Jul 2011 23:49:48 +0900 Subject: [PATCH] Fix http.ClientRequest crashes if end() was called twice Fixes #1417. Fixes #1223. --- lib/http.js | 3 +++ test/simple/test-http-request-end-twice.js | 38 ++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 test/simple/test-http-request-end-twice.js diff --git a/lib/http.js b/lib/http.js index e7e28e8..794af64 100644 --- a/lib/http.js +++ b/lib/http.js @@ -648,6 +648,9 @@ OutgoingMessage.prototype.addTrailers = function(headers) { OutgoingMessage.prototype.end = function(data, encoding) { + if (this.finished) { + return false; + } if (!this._header) { this._implicitHeader(); } diff --git a/test/simple/test-http-request-end-twice.js b/test/simple/test-http-request-end-twice.js new file mode 100644 index 0000000..5ab529e --- /dev/null +++ b/test/simple/test-http-request-end-twice.js @@ -0,0 +1,38 @@ +// 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 http = require('http'); + +var server = http.Server(function(req, res) { + res.writeHead(200, {'Content-Type': 'text/plain'}); + res.end("hello world\n"); +}); +server.listen(common.PORT, function() { + var req = http.get({port: common.PORT}, function(res) { + res.on('end', function() { + assert.ok(!req.end()); + server.close(); + }); + }); +}); + -- 2.7.4