From 1d2ffc6397714686421c939c49104983aca933cd Mon Sep 17 00:00:00 2001
From: Robert Nagy <ronagy@icloud.com>
Date: Mon, 23 Aug 2021 15:52:05 +0200
Subject: [PATCH] fixup

---
 lib/_http_incoming.js            | 1 -
 lib/_http_server.js              | 2 +-
 lib/internal/streams/readable.js | 5 -----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/_http_incoming.js b/lib/_http_incoming.js
index 071721cefd23b7..e0f1354e6c969c 100644
--- a/lib/_http_incoming.js
+++ b/lib/_http_incoming.js
@@ -87,7 +87,6 @@ function IncomingMessage(socket) {
   this.statusMessage = null;
   this.client = socket;
 
-  // TODO: Deprecate and remove.
   this._consuming = false;
   // Flag for when we decide that this message cannot possibly be
   // read by the user, so there's no point continuing to handle it.
diff --git a/lib/_http_server.js b/lib/_http_server.js
index 02a9ecb6e69efd..11119169d56f2c 100644
--- a/lib/_http_server.js
+++ b/lib/_http_server.js
@@ -804,7 +804,7 @@ function resOnFinish(req, res, socket, state, server) {
   // If the user never called req.read(), and didn't pipe() or
   // .resume() or .on('data'), then we call req._dump() so that the
   // bytes will be pulled off the wire.
-  if (!req.readableDidRead)
+  if (!req._consuming && !req._readableState.resumeScheduled)
     req._dump();
 
   // Make sure the requestTimeout is cleared before finishing.
diff --git a/lib/internal/streams/readable.js b/lib/internal/streams/readable.js
index 82e621826d22af..03953c37eac280 100644
--- a/lib/internal/streams/readable.js
+++ b/lib/internal/streams/readable.js
@@ -527,8 +527,6 @@ Readable.prototype.read = function(n) {
     this.emit('data', ret);
   }
 
-  state.didRead = true;
-
   return ret;
 };
 
@@ -832,9 +830,7 @@ function pipeOnDrain(src, dest) {
 
     if ((!state.awaitDrainWriters || state.awaitDrainWriters.size === 0) &&
       EE.listenerCount(src, 'data')) {
-      // TODO(ronag): Call resume() instead?
       state.flowing = true;
-      state.didRead = true;
       flow(src);
     }
   };
@@ -982,7 +978,6 @@ Readable.prototype.resume = function() {
 function resume(stream, state) {
   if (!state.resumeScheduled) {
     state.resumeScheduled = true;
-    state.didRead = true;
     process.nextTick(resume_, stream, state);
   }
 }