fix(https2): ipv6 addresses url · forwardemail/superagent@e29fd25

3 files changed

lines changed

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,10 @@ function setProtocol(protocol) {`
`21`	`21`	`};`
`22`	`22`	`}`
`23`	`23`
	`24`	`+function normalizeIpv6Host(host) {`
	`25`	+return net.isIP(host) === 6 ? `[${host}]` : host;
	`26`	`+}`
	`27`	`+`
`24`	`28`	`class Request extends Stream {`
`25`	`29`	`constructor(protocol, options) {`
`26`	`30`	`super();`
`@@ -48,11 +52,12 @@ class Request extends Stream {`
`48`	`52`
`49`	`53`	`this._headers = {};`
`50`	`54`
	`55`	`+const normalizedHost = normalizeIpv6Host(host);`
`51`	`56`	`const session = http2.connect(`
`52`		-`${protocol}//${host}:${port}`,
	`57`	+`${protocol}//${normalizedHost}:${port}`,
`53`	`58`	`sessionOptions`
`54`	`59`	`);`
`55`		-this.setHeader('host', `${host}:${port}`);
	`60`	+this.setHeader('host', `${normalizedHost}:${port}`);
`56`	`61`
`57`	`62`	`session.on('error', (error) => this.emit('error', error));`
`58`	`63`

Original file line number	Diff line number	Diff line change
`@@ -134,23 +134,21 @@ describe('[node] request', () => {`
`134`	`134`	`});`
`135`	`135`	`});`
`136`	`136`
`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();`
`144`	`142`	`});`
	`143`	`+});`
`145`	`144`
`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();`
`151`	`149`	`});`
`152`	`150`	`});`
`153`		`-}`
	`151`	`+});`
`154`	`152`
`155`	`153`	`describe('.buffer()', () => {`
`156`	`154`	`it('should enable buffering', (done) => {`