From 0aa7eceed585ce0b7a4fa7ea9369497eb0a45cb5 Mon Sep 17 00:00:00 2001 From: telenord Date: Wed, 6 Nov 2019 13:22:01 +0300 Subject: [PATCH 1/2] http: rename var to let and const --- lib/_http_server.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/_http_server.js b/lib/_http_server.js index 82f9b91795d8a0..4732d6886504b2 100644 --- a/lib/_http_server.js +++ b/lib/_http_server.js @@ -249,13 +249,13 @@ function writeHead(statusCode, reason, obj) { } this.statusCode = statusCode; - var headers; + let headers; if (this[kOutHeaders]) { // Slow-case: when progressive API and header fields are passed. - var k; + let k; if (obj) { - var keys = Object.keys(obj); - for (var i = 0; i < keys.length; i++) { + const keys = Object.keys(obj); + for (let i = 0; i < keys.length; i++) { k = keys[i]; if (k) this.setHeader(k, obj[k]); } @@ -483,7 +483,7 @@ function socketOnClose(socket, state) { function abortIncoming(incoming) { while (incoming.length) { - var req = incoming.shift(); + const req = incoming.shift(); req.aborted = true; req.emit('aborted'); req.emit('close'); @@ -573,8 +573,8 @@ function onParserExecuteCommon(server, socket, parser, state, ret, d) { socketOnError.call(socket, ret); } else if (parser.incoming && parser.incoming.upgrade) { // Upgrade or CONNECT - var bytesParsed = ret; - var req = parser.incoming; + const bytesParsed = ret; + const req = parser.incoming; debug('SERVER upgrade or connect', req.method); if (!d) @@ -591,10 +591,10 @@ function onParserExecuteCommon(server, socket, parser, state, ret, d) { freeParser(parser, req, socket); parser = null; - var eventName = req.method === 'CONNECT' ? 'connect' : 'upgrade'; + const eventName = req.method === 'CONNECT' ? 'connect' : 'upgrade'; if (eventName === 'upgrade' || server.listenerCount(eventName) > 0) { debug('SERVER have listener for %s', eventName); - var bodyHead = d.slice(bytesParsed, d.length); + const bodyHead = d.slice(bytesParsed, d.length); socket.readableFlowing = null; server.emit(eventName, req, socket, bodyHead); @@ -656,7 +656,7 @@ function resOnFinish(req, res, socket, state, server) { } } else { // Start sending the next message - var m = state.outgoing.shift(); + const m = state.outgoing.shift(); if (m) { m.assignSocket(socket); } @@ -693,7 +693,7 @@ function parserOnIncoming(server, socket, state, req, keepAlive) { // so that we don't become overwhelmed by a flood of // pipelined requests that may never be resolved. if (!socket._paused) { - var ws = socket._writableState; + const ws = socket._writableState; if (ws.needDrain || state.outgoingData >= socket.writableHighWaterMark) { socket._paused = true; // We also need to pause the parser, but don't do that until after From eca6860f3667be371f23d970474480e4dc02aa3f Mon Sep 17 00:00:00 2001 From: telenord Date: Wed, 6 Nov 2019 13:39:36 +0300 Subject: [PATCH 2/2] http: remove bytesParsed var --- lib/_http_server.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/_http_server.js b/lib/_http_server.js index 4732d6886504b2..bc956a01147ad1 100644 --- a/lib/_http_server.js +++ b/lib/_http_server.js @@ -573,7 +573,6 @@ function onParserExecuteCommon(server, socket, parser, state, ret, d) { socketOnError.call(socket, ret); } else if (parser.incoming && parser.incoming.upgrade) { // Upgrade or CONNECT - const bytesParsed = ret; const req = parser.incoming; debug('SERVER upgrade or connect', req.method); @@ -594,7 +593,7 @@ function onParserExecuteCommon(server, socket, parser, state, ret, d) { const eventName = req.method === 'CONNECT' ? 'connect' : 'upgrade'; if (eventName === 'upgrade' || server.listenerCount(eventName) > 0) { debug('SERVER have listener for %s', eventName); - const bodyHead = d.slice(bytesParsed, d.length); + const bodyHead = d.slice(ret, d.length); socket.readableFlowing = null; server.emit(eventName, req, socket, bodyHead);