Skip to content

Ensure conflicting flat headers in HTTP/2 are combined correctly #4196

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
merged 2 commits into from
May 9, 2025
Merged

Ensure conflicting flat headers in HTTP/2 are combined correctly #4196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d4db26
fix: preserve raw headers with multi-values when using HTTP/2
pimterry May 6, 2025
c95e1fb
fix: align automatic comma-separation for different H2 header cases
pimterry May 6, 2025
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
4 changes: 3 additions & 1 deletion lib/dispatcher/client-h2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,11 +295,13 @@ function writeH2 (client, request) {
if (Array.isArray(val)) {
for (let i = 0; i < val.length; i++) {
if (headers[key]) {
headers[key] += `,${val[i]}`
headers[key] += `, ${val[i]}`
} else {
headers[key] = val[i]
}
}
} else if (headers[key]) {
headers[key] += `, ${val}`
} else {
headers[key] = val
}
Expand Down
15 changes: 11 additions & 4 deletions test/http2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,9 @@ test('Should support H2 connection (headers as array)', async t => {
const server = createSecureServer(pem)

server.on('stream', (stream, headers) => {
t.strictEqual(headers['x-my-header'], 'foo')
t.strictEqual(headers['x-my-drink'], 'coffee,tea')
t.strictEqual(headers['x-my-header'], 'foo, bar')
t.strictEqual(headers['x-my-drink'], 'coffee, tea, water')
t.strictEqual(headers['x-other'], 'value')
t.strictEqual(headers[':method'], 'GET')
stream.respond({
'content-type': 'text/plain; charset=utf-8',
Expand All @@ -146,14 +147,20 @@ test('Should support H2 connection (headers as array)', async t => {
allowH2: true
})

t = tspl(t, { plan: 7 })
t = tspl(t, { plan: 8 })
after(() => server.close())
after(() => client.close())

const response = await client.request({
path: '/',
method: 'GET',
headers: ['x-my-header', 'foo', 'x-my-drink', ['coffee', 'tea']]
headers: [
'x-my-header', 'foo',
'x-my-drink', ['coffee', 'tea'],
'x-my-drink', 'water',
'X-My-Header', 'bar',
'x-other', 'value'
]
})

response.body.on('data', chunk => {
Expand Down
Loading