summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMatteo Collina <hello@matteocollina.com>2018-03-26 13:35:08 +0100
committerMatteo Collina <hello@matteocollina.com>2018-03-30 12:13:59 +0200
commitd37e59fa6aee7f5b38696726b0145741ef3eb95b (patch)
treec5696463dd3675d4f26d973da0f626e1dd61280f /lib
parent6c5144f4b1963ba2be7f9fde28d66aa3b9db729f (diff)
downloadandroid-node-v8-d37e59fa6aee7f5b38696726b0145741ef3eb95b.tar.gz
android-node-v8-d37e59fa6aee7f5b38696726b0145741ef3eb95b.tar.bz2
android-node-v8-d37e59fa6aee7f5b38696726b0145741ef3eb95b.zip
stream: fix backpressure when multiple sync
PR-URL: https://github.com/nodejs/node/pull/19613 Fixes: https://github.com/nodejs/node/issues/19601 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
Diffstat (limited to 'lib')
-rw-r--r--lib/_stream_readable.js15
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
index 9f79a07a6f..7c6671fcd0 100644
--- a/lib/_stream_readable.js
+++ b/lib/_stream_readable.js
@@ -310,8 +310,7 @@ function chunkInvalid(state, chunk) {
// 'readable' event will be triggered.
function needMoreData(state) {
return !state.ended &&
- (state.needReadable ||
- state.length < state.highWaterMark ||
+ (state.length < state.highWaterMark ||
state.length === 0);
}
@@ -536,7 +535,17 @@ function emitReadable_(stream) {
if (!state.destroyed && (state.length || state.ended)) {
stream.emit('readable');
}
- state.needReadable = !state.flowing && !state.ended;
+
+ // The stream needs another readable event if
+ // 1. It is not flowing, as the flow mechanism will take
+ // care of it.
+ // 2. It is not ended.
+ // 3. It is below the highWaterMark, so we can schedule
+ // another readable later.
+ state.needReadable =
+ !state.flowing &&
+ !state.ended &&
+ state.length <= state.highWaterMark;
flow(stream);
}