Skip to content

Commit d301224

Browse files
committed
fix(https2): ipv6 addresses url
fix oops
1 parent 150eb6c commit d301224

File tree

3 files changed

+17
-14
lines changed

3 files changed

+17
-14
lines changed

.dist.eslintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"no-undef": "off",
1818
"no-unused-vars": "off",
1919
"no-useless-escape": "off",
20+
"no-obj-calls": "off",
2021
"no-cond-assign": "off",
2122
"no-redeclare": "off",
2223
"node/no-exports-assign": "off",

src/node/http2wrapper.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,17 @@ function setProtocol(protocol) {
2121
};
2222
}
2323

24+
function normalizeIpv6Host(host) {
25+
return net.isIP(host) === 6 ? `[${host}]` : host;
26+
}
27+
2428
class Request extends Stream {
2529
constructor(protocol, options) {
2630
super();
2731
const defaultPort = protocol === 'https:' ? 443 : 80;
2832
const defaultHost = 'localhost';
2933
const port = options.port || defaultPort;
30-
const host = options.host || defaultHost;
34+
const host = normalizeIpv6Host(options.host || defaultHost);
3135

3236
delete options.port;
3337
delete options.host;

test/node/basic.js

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -134,23 +134,21 @@ describe('[node] request', () => {
134134
});
135135
});
136136

137-
if (doesntWorkInHttp2) {
138-
describe('ipv6 address', () => {
139-
it('should successfully query an ipv6 address', (done) => {
140-
request.get(`http://[::]:${process.env.ZUUL_PORT}/url?a=(b%29`).end((error, res) => {
141-
assert.equal('/url?a=(b%29', res.text);
142-
done();
143-
});
137+
describe('ipv6 address', () => {
138+
it('should successfully query an ipv6 address', (done) => {
139+
request.get(`http://[::]:${process.env.ZUUL_PORT}/url?a=(b%29`).end((error, res) => {
140+
assert.equal('/url?a=(b%29', res.text);
141+
done();
144142
});
143+
});
145144

146-
it('should successfully query an ipv6 address', (done) => {
147-
request.get(`http://[::1]:${process.env.ZUUL_PORT}/url?a=(b%29`).end((error, res) => {
148-
assert.equal('/url?a=(b%29', res.text);
149-
done();
150-
});
145+
it('should successfully query an ipv6 address', (done) => {
146+
request.get(`http://[::1]:${process.env.ZUUL_PORT}/url?a=(b%29`).end((error, res) => {
147+
assert.equal('/url?a=(b%29', res.text);
148+
done();
151149
});
152150
});
153-
}
151+
});
154152

155153
describe('.buffer()', () => {
156154
it('should enable buffering', (done) => {

0 commit comments

Comments
 (0)