Skip to content

backport: v7.x: #10654 #10889

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
mscdex merged 6 commits into from
Jan 25, 2017
Merged

backport: v7.x: #10654 #10889

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c9bff04
http: optimize short path validation
mscdex Jan 6, 2017
e7859c2
http: optimize default method case
mscdex Jan 6, 2017
44c0e4f
http: avoid duplicate isArray()
mscdex Jan 6, 2017
5059b76
http: misc ClientRequest cleanup
mscdex Jan 6, 2017
be24cc0
benchmark: add ClientRequest creation benchmark
mscdex Jan 6, 2017
4ff1d31
test: add http.ClientRequest defaults test
mscdex Jan 6, 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
http: misc ClientRequest cleanup 
PR-URL: #10654
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
  • Loading branch information
@mscdex
mscdex committed Jan 19, 2017
commit 5059b76cbcc4c9ad417e07cacbb7876afefe2caf
7 changes: 2 additions & 5 deletions lib/_http_client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,7 @@ function ClientRequest(options, cb) {
var port = options.port = options.port || defaultPort || 80;
var host = options.host = options.hostname || options.host || 'localhost';

if (options.setHost === undefined) {
var setHost = true;
}
var setHost = (options.setHost === undefined);

self.socketPath = options.socketPath;
self.timeout = options.timeout;
Expand Down Expand Up @@ -126,7 +124,7 @@ function ClientRequest(options, cb) {
if (!headersArray) {
if (options.headers) {
var keys = Object.keys(options.headers);
for (var i = 0, l = keys.length; i < l; i++) {
for (var i = 0; i < keys.length; i++) {
var key = keys[i];
self.setHeader(key, options.headers[key]);
}
Expand All @@ -152,7 +150,6 @@ function ClientRequest(options, cb) {
}

if (options.auth && !this.getHeader('Authorization')) {
//basic auth
this.setHeader('Authorization', 'Basic ' +
Buffer.from(options.auth).toString('base64'));
}
Expand Down