Skip to content

Commit 61e0103

Browse files
sebdeckerstargos
authored andcommitted
http2: add compat support for nested array headers
writeHead supports an array of arrays containing header name and values. Compatibility between http2 & http1 even though this is not documented. Fixes: #24466 PR-URL: #24665 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent d5bf736 commit 61e0103

File tree

2 files changed

+50
-2
lines changed

2 files changed

+50
-2
lines changed

lib/internal/http2/compat.js

+8-2
Original file line numberDiff line numberDiff line change
@@ -574,10 +574,16 @@ class Http2ServerResponse extends Stream {
574574
if (headers === undefined && typeof statusMessage === 'object')
575575
headers = statusMessage;
576576

577-
if (typeof headers === 'object') {
577+
var i;
578+
if (Array.isArray(headers)) {
579+
for (i = 0; i < headers.length; i++) {
580+
const header = headers[i];
581+
this[kSetHeader](header[0], header[1]);
582+
}
583+
} else if (typeof headers === 'object') {
578584
const keys = Object.keys(headers);
579585
let key = '';
580-
for (var i = 0; i < keys.length; i++) {
586+
for (i = 0; i < keys.length; i++) {
581587
key = keys[i];
582588
this[kSetHeader](key, headers[key]);
583589
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
'use strict';
2+
3+
const common = require('../common');
4+
if (!common.hasCrypto)
5+
common.skip('missing crypto');
6+
const assert = require('assert');
7+
const h2 = require('http2');
8+
9+
// Http2ServerResponse.writeHead should support nested arrays
10+
11+
const server = h2.createServer();
12+
server.listen(0, common.mustCall(() => {
13+
const port = server.address().port;
14+
server.once('request', common.mustCall((request, response) => {
15+
response.writeHead(200, [
16+
['foo', 'bar'],
17+
['ABC', 123]
18+
]);
19+
response.end(common.mustCall(() => { server.close(); }));
20+
}));
21+
22+
const url = `http://localhost:${port}`;
23+
const client = h2.connect(url, common.mustCall(() => {
24+
const headers = {
25+
':path': '/',
26+
':method': 'GET',
27+
':scheme': 'http',
28+
':authority': `localhost:${port}`
29+
};
30+
const request = client.request(headers);
31+
request.on('response', common.mustCall((headers) => {
32+
assert.strictEqual(headers.foo, 'bar');
33+
assert.strictEqual(headers.abc, '123');
34+
assert.strictEqual(headers[':status'], 200);
35+
}, 1));
36+
request.on('end', common.mustCall(() => {
37+
client.close();
38+
}));
39+
request.end();
40+
request.resume();
41+
}));
42+
}));

0 commit comments

Comments
 (0)