Permalink
Browse files

http: emit Error object after .abort()

It was emitting the net.Socket object due to misuse of the arguments object.

Fixes #1399.
  • Loading branch information...
1 parent 1ba834b commit 8acc0e45e1768a204e4726133a8be1e23ed5e3ff @bnoordhuis committed Nov 3, 2011
Showing with 46 additions and 3 deletions.
  1. +3 −3 lib/http.js
  2. +43 −0 test/simple/test-http-abort-before-end.js
View
@@ -1239,7 +1239,7 @@ ClientRequest.prototype.onSocket = function(socket) {
});
};
-ClientRequest.prototype._deferToConnect = function(method, arguments, cb) {
+ClientRequest.prototype._deferToConnect = function(method, arguments_, cb) {
// This function is for calls that need to happen once the socket is
// connected and writable. It's an important promisy thing for all the socket
// calls that happen either now (when a socket is assigned) or
@@ -1249,13 +1249,13 @@ ClientRequest.prototype._deferToConnect = function(method, arguments, cb) {
var onSocket = function() {
if (self.socket.writable) {
if (method) {
- self.socket[method].apply(self.socket, arguments);
+ self.socket[method].apply(self.socket, arguments_);
}
if (cb) { cb(); }
} else {
self.socket.on('connect', function() {
if (method) {
- self.socket[method].apply(self.socket, arguments);
+ self.socket[method].apply(self.socket, arguments_);
}
if (cb) { cb(); }
});
@@ -0,0 +1,43 @@
+// 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 http = require('http');
+var assert = require('assert');
+
+var server = http.createServer(function(req, res) {
+ assert(false); // should not be called
+});
+
+server.listen(common.PORT, function() {
+ var req = http.request({method:'GET', host:'127.0.0.1', port:common.PORT});
+
+ req.on('error', function(ex) {
+ // https://github.com/joyent/node/issues/1399#issuecomment-2597359
+ // abort() should emit an Error, not the net.Socket object
+ assert(ex instanceof Error);
+ });
+
+ req.abort();
+ req.end();
+
+ server.close();
+});

1 comment on commit 8acc0e4

ry commented on 8acc0e4 Nov 3, 2011

LGTM

Please sign in to comment.