Skip to content
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

Jump to bottom

http2: support passing options of http2.connect to net.connect #29816

Closed
wants to merge 1 commit into from
Closed

http2: support passing options of http2.connect to net.connect #29816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/internal/http2/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2897,7 +2897,7 @@ function connect(authority, options, listener) {
} else {
switch (protocol) {
case 'http:':
socket = net.connect(options.port || port, options.host || host);
socket = net.connect({ port, host, ...options });
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it intentional that options.host and options.port would now take precedence over those same fields in authority?

Copy link
Member Author

@ZYSzys ZYSzys Oct 5, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it intentional that options.host and options.port would now take precedence over those same fields in authority

I think yes, however this behavior wasn't changed here but in #28584.

break;
case 'https:':
socket = tls.connect(port, host, initializeTLSOptions(options, host));
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-http2-client-port-80.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const net = require('net');

const connect = net.connect;
net.connect = common.mustCall((...args) => {
assert.strictEqual(args[0], '80');
assert.strictEqual(args[0].port, '80');
return connect(...args);
});

Expand Down
42 changes: 42 additions & 0 deletions test/parallel/test-http2-connect-options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// Flags: --expose-internals
'use strict';
const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');

if (!common.hasMultiLocalhost())
common.skip('platform-specific test.');

const http2 = require('http2');
const assert = require('assert');

const server = http2.createServer((req, res) => {
console.log(`Connect from: ${req.connection.remoteAddress}`);
assert.strictEqual(req.connection.remoteAddress, '127.0.0.2');

req.on('end', common.mustCall(() => {
res.writeHead(200, { 'Content-Type': 'text/plain' });
res.end(`You are from: ${req.connection.remoteAddress}`);
}));
req.resume();
});

server.listen(0, '127.0.0.1', common.mustCall(() => {
const options = { localAddress: '127.0.0.2' };

const client = http2.connect(
'http://localhost:' + server.address().port,
options
);
const req = client.request({
':path': '/'
});
req.on('data', () => req.resume());
req.on('end', common.mustCall(function() {
client.close();
req.close();
server.close();
process.exit();
}));
req.end();
}));