diff options
author | James M Snell <jasnell@gmail.com> | 2017-12-12 11:34:17 -0800 |
---|---|---|
committer | James M Snell <jasnell@gmail.com> | 2017-12-18 10:19:21 -0800 |
commit | 0babd181a0c5d775e62a12b3b04fe4d7654fe80a (patch) | |
tree | cf02bdb6a71b8d346109d1ab66e18c559dbf5a23 /test/parallel/test-http2-misused-pseudoheaders.js | |
parent | 18ca0b64422337cc6844949b9b97f39fef82f512 (diff) | |
download | android-node-v8-0babd181a0c5d775e62a12b3b04fe4d7654fe80a.tar.gz android-node-v8-0babd181a0c5d775e62a12b3b04fe4d7654fe80a.tar.bz2 android-node-v8-0babd181a0c5d775e62a12b3b04fe4d7654fe80a.zip |
http2: cleanup Http2Stream/Http2Session destroy
PR-URL: https://github.com/nodejs/node/pull/17406
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
This is a significant cleanup and refactoring of the
cleanup/close/destroy logic for Http2Stream and Http2Session.
There are significant changes here in the timing and ordering
of cleanup logic, JS apis. and various related necessary edits.
Diffstat (limited to 'test/parallel/test-http2-misused-pseudoheaders.js')
-rw-r--r-- | test/parallel/test-http2-misused-pseudoheaders.js | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/test/parallel/test-http2-misused-pseudoheaders.js b/test/parallel/test-http2-misused-pseudoheaders.js index 1f501598c1..b47462b14f 100644 --- a/test/parallel/test-http2-misused-pseudoheaders.js +++ b/test/parallel/test-http2-misused-pseudoheaders.js @@ -7,11 +7,7 @@ const h2 = require('http2'); const server = h2.createServer(); -// we use the lower-level API here -server.on('stream', common.mustCall(onStream)); - -function onStream(stream, headers, flags) { - +server.on('stream', common.mustCall((stream) => { [ ':path', ':authority', @@ -24,10 +20,7 @@ function onStream(stream, headers, flags) { }); }); - stream.respond({ - 'content-type': 'text/html', - ':status': 200 - }, { + stream.respond({}, { getTrailers: common.mustCall((trailers) => { trailers[':status'] = 'bar'; }) @@ -38,22 +31,24 @@ function onStream(stream, headers, flags) { })); stream.end('hello world'); -} - -server.listen(0); +})); -server.on('listening', common.mustCall(() => { +server.listen(0, common.mustCall(() => { const client = h2.connect(`http://localhost:${server.address().port}`); + const req = client.request(); - const req = client.request({ ':path': '/' }); + req.on('error', common.expectsError({ + code: 'ERR_HTTP2_STREAM_ERROR', + type: Error, + message: 'Stream closed with error code 2' + })); req.on('response', common.mustCall()); req.resume(); - req.on('end', common.mustCall(() => { + req.on('end', common.mustCall()); + req.on('close', common.mustCall(() => { server.close(); - client.destroy(); + client.close(); })); - req.end(); - })); |