From 4c24a82a654e1d9561af5e47ad98a31c34bca5c3 Mon Sep 17 00:00:00 2001 From: Gerhard Stoebich <18708370+Flarna@users.noreply.github.com> Date: Sun, 2 Dec 2018 19:27:06 +0100 Subject: [PATCH] http2: fix sequence of error/close events Correct sequence of emitting `error` and `close` events for a `Http2Stream`. PR-URL: https://github.com/nodejs/node/pull/24789 Refs: https://github.com/nodejs/node/pull/22850 Refs: https://github.com/nodejs/node/pull/24685 Fixes: https://github.com/nodejs/node/issues/24559 Reviewed-By: Luigi Pinca Reviewed-By: Matteo Collina Reviewed-By: Trivikram Kamat --- lib/internal/http2/core.js | 3 +-- test/parallel/test-http2-stream-destroy-event-order.js | 9 ++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js index 4c184fcfe188df..055009d07c815b 100644 --- a/lib/internal/http2/core.js +++ b/lib/internal/http2/core.js @@ -1997,9 +1997,8 @@ class Http2Stream extends Duplex { // will destroy if it has been closed and there are no other open or // pending streams. session[kMaybeDestroy](); - process.nextTick(emit, this, 'close', code); callback(err); - + process.nextTick(emit, this, 'close', code); } // The Http2Stream can be destroyed if it has closed and if the readable // side has received the final chunk. diff --git a/test/parallel/test-http2-stream-destroy-event-order.js b/test/parallel/test-http2-stream-destroy-event-order.js index 7d4bcb102f0d0a..88e4a99f99eee3 100644 --- a/test/parallel/test-http2-stream-destroy-event-order.js +++ b/test/parallel/test-http2-stream-destroy-event-order.js @@ -1,4 +1,3 @@ -// Flags: --expose-http2 'use strict'; const common = require('../common'); @@ -10,8 +9,8 @@ let client; let req; const server = http2.createServer(); server.on('stream', common.mustCall((stream) => { - stream.on('close', common.mustCall(() => { - stream.on('error', common.mustCall(() => { + stream.on('error', common.mustCall(() => { + stream.on('close', common.mustCall(() => { server.close(); })); })); @@ -22,8 +21,8 @@ server.listen(0, common.mustCall(() => { client = http2.connect(`http://localhost:${server.address().port}`); req = client.request(); req.resume(); - req.on('close', common.mustCall(() => { - req.on('error', common.mustCall(() => { + req.on('error', common.mustCall(() => { + req.on('close', common.mustCall(() => { client.close(); })); }));