Skip to content

Commit 85b8c57

Browse files
authored
test: disable header de-duplication in test servers (#4110)
Closes #4109 Co-authored-by: alxndrsn <alxndrsn>
1 parent 6211fac commit 85b8c57

File tree

146 files changed

+729
-724
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+729
-724
lines changed

test/client-connect.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ test('connect aborted after connect', async (t) => {
1313
t = tspl(t, { plan: 3 })
1414

1515
const signal = new EE()
16-
const server = http.createServer((req, res) => {
16+
const server = http.createServer({ joinDuplicateHeaders: true }, (req, res) => {
1717
t.fail()
1818
})
1919
server.on('connect', (req, c, firstBodyChunk) => {

test/client-head-reset-override.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ test('override HEAD reset', async (t) => {
1010
t = tspl(t, { plan: 4 })
1111

1212
const expected = 'testing123'
13-
const server = createServer((req, res) => {
13+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
1414
if (req.method === 'GET') {
1515
res.write(expected)
1616
}

test/client-idempotent-body.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ test('idempotent retry', async (t) => {
99
t = tspl(t, { plan: 11 })
1010

1111
const body = 'world'
12-
const server = createServer((req, res) => {
12+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
1313
let buf = ''
1414
req.on('data', data => {
1515
buf += data

test/client-keep-alive.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ test('Disable keep alive', async (t) => {
341341
t = tspl(t, { plan: 7 })
342342

343343
const ports = []
344-
const server = http.createServer((req, res) => {
344+
const server = http.createServer({ joinDuplicateHeaders: true }, (req, res) => {
345345
t.strictEqual(ports.includes(req.socket.remotePort), false)
346346
ports.push(req.socket.remotePort)
347347
t.strictEqual(req.headers.connection, 'close')

test/client-node-max-header-size.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ describe("Node.js' --max-http-header-size cli option", () => {
1010
let server
1111

1212
before(async () => {
13-
server = createServer((req, res) => {
13+
server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
1414
res.writeHead(200, 'OK', {
1515
'Content-Length': 2
1616
})

test/client-pipeline.js

+30-30
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const {
1616
test('pipeline get', async (t) => {
1717
t = tspl(t, { plan: 17 })
1818

19-
const server = createServer((req, res) => {
19+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
2020
t.strictEqual('/', req.url)
2121
t.strictEqual('GET', req.method)
2222
t.strictEqual(`localhost:${server.address().port}`, req.headers.host)
@@ -75,7 +75,7 @@ test('pipeline get', async (t) => {
7575
test('pipeline echo', async (t) => {
7676
t = tspl(t, { plan: 2 })
7777

78-
const server = createServer((req, res) => {
78+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
7979
req.pipe(res)
8080
})
8181
after(() => server.close())
@@ -124,7 +124,7 @@ test('pipeline ignore request body', async (t) => {
124124
t = tspl(t, { plan: 2 })
125125

126126
let done
127-
const server = createServer((req, res) => {
127+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
128128
res.write('asd')
129129
res.end()
130130
done()
@@ -185,7 +185,7 @@ test('pipeline invalid handler', async (t) => {
185185
test('pipeline invalid handler return after destroy should not error', async (t) => {
186186
t = tspl(t, { plan: 3 })
187187

188-
const server = createServer((req, res) => {
188+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
189189
req.pipe(res)
190190
})
191191
after(() => server.close())
@@ -221,7 +221,7 @@ test('pipeline invalid handler return after destroy should not error', async (t)
221221
test('pipeline error body', async (t) => {
222222
t = tspl(t, { plan: 2 })
223223

224-
const server = createServer((req, res) => {
224+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
225225
req.pipe(res)
226226
})
227227
after(() => server.close())
@@ -263,7 +263,7 @@ test('pipeline error body', async (t) => {
263263
test('pipeline destroy body', async (t) => {
264264
t = tspl(t, { plan: 2 })
265265

266-
const server = createServer((req, res) => {
266+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
267267
req.pipe(res)
268268
})
269269
after(() => server.close())
@@ -305,7 +305,7 @@ test('pipeline destroy body', async (t) => {
305305
test('pipeline backpressure', async (t) => {
306306
t = tspl(t, { plan: 1 })
307307

308-
const server = createServer((req, res) => {
308+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
309309
req.pipe(res)
310310
})
311311
after(() => server.close())
@@ -340,7 +340,7 @@ test('pipeline backpressure', async (t) => {
340340
test('pipeline invalid handler return', async (t) => {
341341
t = tspl(t, { plan: 2 })
342342

343-
const server = createServer((req, res) => {
343+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
344344
req.pipe(res)
345345
})
346346
after(() => server.close())
@@ -381,7 +381,7 @@ test('pipeline invalid handler return', async (t) => {
381381
test('pipeline throw handler', async (t) => {
382382
t = tspl(t, { plan: 1 })
383383

384-
const server = createServer((req, res) => {
384+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
385385
req.pipe(res)
386386
})
387387
after(() => server.close())
@@ -410,7 +410,7 @@ test('pipeline throw handler', async (t) => {
410410
test('pipeline destroy and throw handler', async (t) => {
411411
t = tspl(t, { plan: 2 })
412412

413-
const server = createServer((req, res) => {
413+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
414414
req.pipe(res)
415415
})
416416
after(() => server.close())
@@ -444,7 +444,7 @@ test('pipeline abort res', async (t) => {
444444
t = tspl(t, { plan: 2 })
445445

446446
let _res
447-
const server = createServer((req, res) => {
447+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
448448
res.write('asd')
449449
_res = res
450450
})
@@ -483,7 +483,7 @@ test('pipeline abort res', async (t) => {
483483
test('pipeline abort server res', async (t) => {
484484
t = tspl(t, { plan: 1 })
485485

486-
const server = createServer((req, res) => {
486+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
487487
res.destroy()
488488
})
489489
after(() => server.close())
@@ -510,7 +510,7 @@ test('pipeline abort server res', async (t) => {
510510
test('pipeline abort duplex', async (t) => {
511511
t = tspl(t, { plan: 2 })
512512

513-
const server = createServer((req, res) => {
513+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
514514
res.end()
515515
})
516516
after(() => server.close())
@@ -543,7 +543,7 @@ test('pipeline abort duplex', async (t) => {
543543
test('pipeline abort piped res', async (t) => {
544544
t = tspl(t, { plan: 1 })
545545

546-
const server = createServer((req, res) => {
546+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
547547
res.write('asd')
548548
})
549549
after(() => server.close())
@@ -574,7 +574,7 @@ test('pipeline abort piped res', async (t) => {
574574
test('pipeline abort piped res 2', async (t) => {
575575
t = tspl(t, { plan: 2 })
576576

577-
const server = createServer((req, res) => {
577+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
578578
res.write('asd')
579579
})
580580
after(() => server.close())
@@ -609,7 +609,7 @@ test('pipeline abort piped res 2', async (t) => {
609609
test('pipeline abort piped res 3', async (t) => {
610610
t = tspl(t, { plan: 2 })
611611

612-
const server = createServer((req, res) => {
612+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
613613
res.write('asd')
614614
})
615615
after(() => server.close())
@@ -645,7 +645,7 @@ test('pipeline abort server res after headers', async (t) => {
645645
t = tspl(t, { plan: 1 })
646646

647647
let _res
648-
const server = createServer((req, res) => {
648+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
649649
res.write('asd')
650650
_res = res
651651
})
@@ -675,7 +675,7 @@ test('pipeline w/ write abort server res after headers', async (t) => {
675675
t = tspl(t, { plan: 1 })
676676

677677
let _res
678-
const server = createServer((req, res) => {
678+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
679679
req.pipe(res)
680680
_res = res
681681
})
@@ -706,7 +706,7 @@ test('destroy in push', async (t) => {
706706
t = tspl(t, { plan: 3 })
707707

708708
let _res
709-
const server = createServer((req, res) => {
709+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
710710
res.write('asd')
711711
_res = res
712712
})
@@ -763,7 +763,7 @@ test('pipeline args validation', async (t) => {
763763
test('pipeline factory throw not unhandled', async (t) => {
764764
t = tspl(t, { plan: 1 })
765765

766-
const server = createServer((req, res) => {
766+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
767767
res.write('asd')
768768
})
769769
after(() => server.close())
@@ -790,7 +790,7 @@ test('pipeline factory throw not unhandled', async (t) => {
790790
test('pipeline destroy before dispatch', async (t) => {
791791
t = tspl(t, { plan: 1 })
792792

793-
const server = createServer((req, res) => {
793+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
794794
res.end('hello')
795795
})
796796
after(() => server.close())
@@ -816,7 +816,7 @@ test('pipeline destroy before dispatch', async (t) => {
816816
test('pipeline legacy stream', async (t) => {
817817
t = tspl(t, { plan: 1 })
818818

819-
const server = createServer((req, res) => {
819+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
820820
res.write(Buffer.alloc(16e3))
821821
setImmediate(() => {
822822
res.end(Buffer.alloc(16e3))
@@ -847,7 +847,7 @@ test('pipeline legacy stream', async (t) => {
847847
test('pipeline objectMode', async (t) => {
848848
t = tspl(t, { plan: 1 })
849849

850-
const server = createServer((req, res) => {
850+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
851851
res.end(JSON.stringify({ asd: 1 }))
852852
})
853853
after(() => server.close())
@@ -877,7 +877,7 @@ test('pipeline objectMode', async (t) => {
877877
test('pipeline invalid opts', async (t) => {
878878
t = tspl(t, { plan: 2 })
879879

880-
const server = createServer((req, res) => {
880+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
881881
res.end(JSON.stringify({ asd: 1 }))
882882
})
883883
after(() => server.close())
@@ -904,7 +904,7 @@ test('pipeline invalid opts', async (t) => {
904904
test('pipeline CONNECT throw', async (t) => {
905905
t = tspl(t, { plan: 1 })
906906

907-
const server = createServer((req, res) => {
907+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
908908
res.end('asd')
909909
})
910910
after(() => server.close())
@@ -932,7 +932,7 @@ test('pipeline CONNECT throw', async (t) => {
932932
test('pipeline body without destroy', async (t) => {
933933
t = tspl(t, { plan: 1 })
934934

935-
const server = createServer((req, res) => {
935+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
936936
res.end('asd')
937937
})
938938
after(() => server.close())
@@ -962,7 +962,7 @@ test('pipeline body without destroy', async (t) => {
962962
test('pipeline ignore 1xx', async (t) => {
963963
t = tspl(t, { plan: 1 })
964964

965-
const server = createServer((req, res) => {
965+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
966966
res.writeProcessing()
967967
res.end('hello')
968968
})
@@ -993,7 +993,7 @@ test('pipeline ignore 1xx and use onInfo', async (t) => {
993993
t = tspl(t, { plan: 3 })
994994

995995
const infos = []
996-
const server = createServer((req, res) => {
996+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
997997
res.writeProcessing()
998998
res.end('hello')
999999
})
@@ -1030,7 +1030,7 @@ test('pipeline backpressure', async (t) => {
10301030

10311031
const expected = Buffer.alloc(1e6).toString()
10321032

1033-
const server = createServer((req, res) => {
1033+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
10341034
res.writeProcessing()
10351035
res.end(expected)
10361036
})
@@ -1068,7 +1068,7 @@ test('pipeline backpressure', async (t) => {
10681068
test('pipeline abort after headers', async (t) => {
10691069
t = tspl(t, { plan: 1 })
10701070

1071-
const server = createServer((req, res) => {
1071+
const server = createServer({ joinDuplicateHeaders: true }, (req, res) => {
10721072
res.writeProcessing()
10731073
res.write('asd')
10741074
setImmediate(() => {

0 commit comments

Comments
 (0)