summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/_http_client.js12
-rw-r--r--lib/_tls_wrap.js6
-rw-r--r--lib/assert.js22
-rw-r--r--lib/console.js5
-rw-r--r--lib/net.js12
5 files changed, 43 insertions, 14 deletions
diff --git a/lib/_http_client.js b/lib/_http_client.js
index 81fa5dabd4..2b37ad1a82 100644
--- a/lib/_http_client.js
+++ b/lib/_http_client.js
@@ -608,10 +608,18 @@ ClientRequest.prototype.setTimeout = function(msecs, callback) {
};
ClientRequest.prototype.setNoDelay = function() {
- this._deferToConnect('setNoDelay', arguments);
+ const argsLen = arguments.length;
+ const args = new Array(argsLen);
+ for (var i = 0; i < argsLen; i++)
+ args[i] = arguments[i];
+ this._deferToConnect('setNoDelay', args);
};
ClientRequest.prototype.setSocketKeepAlive = function() {
- this._deferToConnect('setKeepAlive', arguments);
+ const argsLen = arguments.length;
+ const args = new Array(argsLen);
+ for (var i = 0; i < argsLen; i++)
+ args[i] = arguments[i];
+ this._deferToConnect('setKeepAlive', args);
};
ClientRequest.prototype.clearTimeout = function(cb) {
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
index cbeb48c072..697fbfa3e5 100644
--- a/lib/_tls_wrap.js
+++ b/lib/_tls_wrap.js
@@ -960,7 +960,11 @@ function normalizeConnectArgs(listArgs) {
}
exports.connect = function(/* [port, host], options, cb */) {
- var args = normalizeConnectArgs(arguments);
+ const argsLen = arguments.length;
+ var args = new Array(argsLen);
+ for (var i = 0; i < argsLen; i++)
+ args[i] = arguments[i];
+ args = normalizeConnectArgs(args);
var options = args[0];
var cb = args[1];
diff --git a/lib/assert.js b/lib/assert.js
index 737b819cb1..c2b6699c66 100644
--- a/lib/assert.js
+++ b/lib/assert.js
@@ -290,6 +290,16 @@ function expectedException(actual, expected) {
return expected.call({}, actual) === true;
}
+function _tryBlock(block) {
+ var error;
+ try {
+ block();
+ } catch (e) {
+ error = e;
+ }
+ return error;
+}
+
function _throws(shouldThrow, block, expected, message) {
var actual;
@@ -302,11 +312,7 @@ function _throws(shouldThrow, block, expected, message) {
expected = null;
}
- try {
- block();
- } catch (e) {
- actual = e;
- }
+ actual = _tryBlock(block);
message = (expected && expected.name ? ' (' + expected.name + ').' : '.') +
(message ? ' ' + message : '.');
@@ -329,12 +335,12 @@ function _throws(shouldThrow, block, expected, message) {
// assert.throws(block, Error_opt, message_opt);
assert.throws = function(block, /*optional*/error, /*optional*/message) {
- _throws.apply(this, [true].concat(pSlice.call(arguments)));
+ _throws(true, block, error, message);
};
// EXTENSION! This is annoying to write outside this module.
-assert.doesNotThrow = function(block, /*optional*/message) {
- _throws.apply(this, [false].concat(pSlice.call(arguments)));
+assert.doesNotThrow = function(block, /*optional*/error, /*optional*/message) {
+ _throws(false, block, error, message);
};
assert.ifError = function(err) { if (err) throw err; };
diff --git a/lib/console.js b/lib/console.js
index 21b2d01de0..8bdfc14b5f 100644
--- a/lib/console.js
+++ b/lib/console.js
@@ -85,7 +85,10 @@ Console.prototype.trace = function trace() {
Console.prototype.assert = function(expression) {
if (!expression) {
- var arr = Array.prototype.slice.call(arguments, 1);
+ const argsLen = arguments.length || 1;
+ const arr = new Array(argsLen - 1);
+ for (var i = 1; i < argsLen; i++)
+ arr[i - 1] = arguments[i];
require('assert').ok(false, util.format.apply(null, arr));
}
};
diff --git a/lib/net.js b/lib/net.js
index f75c9b25b8..2442bcdee3 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -59,7 +59,11 @@ exports.createServer = function(options, connectionListener) {
// connect(path, [cb]);
//
exports.connect = exports.createConnection = function() {
- var args = normalizeConnectArgs(arguments);
+ const argsLen = arguments.length;
+ var args = new Array(argsLen);
+ for (var i = 0; i < argsLen; i++)
+ args[i] = arguments[i];
+ args = normalizeConnectArgs(args);
debug('createConnection', args);
var s = new Socket(args[0]);
return Socket.prototype.connect.apply(s, args);
@@ -858,7 +862,11 @@ Socket.prototype.connect = function(options, cb) {
// Old API:
// connect(port, [host], [cb])
// connect(path, [cb]);
- var args = normalizeConnectArgs(arguments);
+ const argsLen = arguments.length;
+ var args = new Array(argsLen);
+ for (var i = 0; i < argsLen; i++)
+ args[i] = arguments[i];
+ args = normalizeConnectArgs(args);
return Socket.prototype.connect.apply(this, args);
}