summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAnatoli Papirovski <apapirovski@mac.com>2018-04-18 10:20:13 +0200
committerRuben Bridgewater <ruben@bridgewater.de>2018-04-23 15:59:28 +0200
commit54e112dd61a5af6622f66cabca67474ae93113eb (patch)
tree739b5c98467fa4fcef54f93ac899676698f6a9fa /lib
parent58e0800b81f6867690d571820e73df6d3ec2ce55 (diff)
downloadandroid-node-v8-54e112dd61a5af6622f66cabca67474ae93113eb.tar.gz
android-node-v8-54e112dd61a5af6622f66cabca67474ae93113eb.tar.bz2
android-node-v8-54e112dd61a5af6622f66cabca67474ae93113eb.zip
http: remove duplicate parser unset
freeParser already unsets parser property of socket if socket is passed in specifically. There's no need to do this twice. PR-URL: https://github.com/nodejs/node/pull/20126 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/_http_common.js2
-rw-r--r--lib/_http_server.js2
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/_http_common.js b/lib/_http_common.js
index 7eb37511bd..ab075dc817 100644
--- a/lib/_http_common.js
+++ b/lib/_http_common.js
@@ -191,8 +191,6 @@ function freeParser(parser, req, socket) {
if (parser._consumed)
parser.unconsume();
parser._consumed = false;
- if (parser.socket)
- parser.socket.parser = null;
parser.socket = null;
parser.incoming = null;
parser.outgoing = null;
diff --git a/lib/_http_server.js b/lib/_http_server.js
index 1d6cada327..bf228de643 100644
--- a/lib/_http_server.js
+++ b/lib/_http_server.js
@@ -522,7 +522,7 @@ function onParserExecuteCommon(server, socket, parser, state, ret, d) {
socket.removeListener('error', socketOnError);
unconsume(parser, socket);
parser.finish();
- freeParser(parser, req, null);
+ freeParser(parser, req, socket);
parser = null;
var eventName = req.method === 'CONNECT' ? 'connect' : 'upgrade';