summaryrefslogtreecommitdiff
path: root/lib/_http_server.js
diff options
context:
space:
mode:
authorAnatoli Papirovski <apapirovski@mac.com>2018-04-17 00:45:43 +0200
committerAnatoli Papirovski <apapirovski@mac.com>2018-04-19 08:41:17 +0200
commit3d480dcf4c270cbf5a3acef08fc6b8d25576411b (patch)
treea5d8c869b7d2d8c558cb875228576495053e997e /lib/_http_server.js
parentbbdb4af0bd7abd9751e2d7bf85e7b535cb0802fa (diff)
downloadandroid-node-v8-3d480dcf4c270cbf5a3acef08fc6b8d25576411b.tar.gz
android-node-v8-3d480dcf4c270cbf5a3acef08fc6b8d25576411b.tar.bz2
android-node-v8-3d480dcf4c270cbf5a3acef08fc6b8d25576411b.zip
http: fix _dump regression
A recent set of changes removed _consuming tracking from server incoming messages which ensures that _dump only runs if the user has never attempted to read the incoming data. Fix by reintroducing _consuming which tracks whether _read was ever successfully called. PR-URL: https://github.com/nodejs/node/pull/20088 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Diffstat (limited to 'lib/_http_server.js')
-rw-r--r--lib/_http_server.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/_http_server.js b/lib/_http_server.js
index a8389dbda6..c3abfd37bb 100644
--- a/lib/_http_server.js
+++ b/lib/_http_server.js
@@ -560,7 +560,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._readableState.resumeScheduled)
+ if (!req._consuming && !req._readableState.resumeScheduled)
req._dump();
res.detachSocket(socket);