Skip to content

net: micro cleanups #12342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bnoordhuis merged 6 commits into from
Apr 18, 2017
Merged

net: micro cleanups #12342

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b48303
net: don't create unnecessary closure
bnoordhuis Apr 11, 2017
117b83c
net: don't create unnecessary closure
bnoordhuis Apr 11, 2017
571882c
net: remove unnecessary process.nextTick()
bnoordhuis Apr 11, 2017
9433434
net: don't concatenate strings in debug logging
bnoordhuis Apr 11, 2017
bb06add
net: don't normalize twice in Socket#connect()
bnoordhuis Apr 11, 2017
5d06e5c
net: require 'dns' only once
bnoordhuis Apr 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
net: don't normalize twice in Socket#connect() 
Split up Socket#connect() so that we don't call normalizeArgs() twice
when invoking net.connect() or net.createConnection().

PR-URL: #12342
Reviewed-By: Benjamin Gruenbaum <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Evan Lucas <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
  • Loading branch information
@bnoordhuis
bnoordhuis committed Apr 18, 2017
commit bb06add4d78535f10d1dc8f0c8c3210fecb96c8a
8 changes: 6 additions & 2 deletions lib/net.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ function connect() {
socket.setTimeout(options.timeout);
}

return Socket.prototype.connect.call(socket, options, cb);
return realConnect.call(socket, options, cb);
}


Expand Down Expand Up @@ -921,7 +921,11 @@ Socket.prototype.connect = function() {
const normalized = normalizeArgs(args);
const options = normalized[0];
const cb = normalized[1];
return realConnect.call(this, options, cb);
};


function realConnect(options, cb) {
if (this.write !== Socket.prototype.write)
this.write = Socket.prototype.write;

Expand Down Expand Up @@ -962,7 +966,7 @@ Socket.prototype.connect = function() {
lookupAndConnect(this, options);
}
return this;
};
}


function lookupAndConnect(self, options) {
Expand Down