Commit 4fe62c1
http: revise _http_server.js
* replace var with const
* eliminate unnecessary bytesParsed variable
http: remove bytesParsed var
PR-URL: #30279
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Yorkie Liu <yorkiefixer@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent 2c8276e commit 4fe62c1
1 file changed
Lines changed: 10 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -249,13 +249,13 @@ function writeHead(statusCode, reason, obj) { | |||
| 249 | 249 | } | |
| 250 | 250 | this.statusCode = statusCode; | |
| 251 | 251 | ||
| 252 | - var headers; | ||
| 252 | + let headers; | ||
| 253 | 253 | if (this[kOutHeaders]) { | |
| 254 | 254 | // Slow-case: when progressive API and header fields are passed. | |
| 255 | - var k; | ||
| 255 | + let k; | ||
| 256 | 256 | if (obj) { | |
| 257 | - var keys = Object.keys(obj); | ||
| 258 | - for (var i = 0; i < keys.length; i++) { | ||
| 257 | + const keys = Object.keys(obj); | ||
| 258 | + for (let i = 0; i < keys.length; i++) { | ||
| 259 | 259 | k = keys[i]; | |
| 260 | 260 | if (k) this.setHeader(k, obj[k]); | |
| 261 | 261 | } | |
@@ -483,7 +483,7 @@ function socketOnClose(socket, state) { | |||
| 483 | 483 | ||
| 484 | 484 | function abortIncoming(incoming) { | |
| 485 | 485 | while (incoming.length) { | |
| 486 | - var req = incoming.shift(); | ||
| 486 | + const req = incoming.shift(); | ||
| 487 | 487 | req.aborted = true; | |
| 488 | 488 | req.emit('aborted'); | |
| 489 | 489 | req.emit('close'); | |
@@ -573,8 +573,7 @@ function onParserExecuteCommon(server, socket, parser, state, ret, d) { | |||
| 573 | 573 | socketOnError.call(socket, ret); | |
| 574 | 574 | } else if (parser.incoming && parser.incoming.upgrade) { | |
| 575 | 575 | // Upgrade or CONNECT | |
| 576 | - var bytesParsed = ret; | ||
| 577 | - var req = parser.incoming; | ||
| 576 | + const req = parser.incoming; | ||
| 578 | 577 | debug('SERVER upgrade or connect', req.method); | |
| 579 | 578 | ||
| 580 | 579 | if (!d) | |
@@ -591,10 +590,10 @@ function onParserExecuteCommon(server, socket, parser, state, ret, d) { | |||
| 591 | 590 | freeParser(parser, req, socket); | |
| 592 | 591 | parser = null; | |
| 593 | 592 | ||
| 594 | - var eventName = req.method === 'CONNECT' ? 'connect' : 'upgrade'; | ||
| 593 | + const eventName = req.method === 'CONNECT' ? 'connect' : 'upgrade'; | ||
| 595 | 594 | if (eventName === 'upgrade' || server.listenerCount(eventName) > 0) { | |
| 596 | 595 | debug('SERVER have listener for %s', eventName); | |
| 597 | - var bodyHead = d.slice(bytesParsed, d.length); | ||
| 596 | + const bodyHead = d.slice(ret, d.length); | ||
| 598 | 597 | ||
| 599 | 598 | socket.readableFlowing = null; | |
| 600 | 599 | server.emit(eventName, req, socket, bodyHead); | |
@@ -656,7 +655,7 @@ function resOnFinish(req, res, socket, state, server) { | |||
| 656 | 655 | } | |
| 657 | 656 | } else { | |
| 658 | 657 | // Start sending the next message | |
| 659 | - var m = state.outgoing.shift(); | ||
| 658 | + const m = state.outgoing.shift(); | ||
| 660 | 659 | if (m) { | |
| 661 | 660 | m.assignSocket(socket); | |
| 662 | 661 | } | |
@@ -693,7 +692,7 @@ function parserOnIncoming(server, socket, state, req, keepAlive) { | |||
| 693 | 692 | // so that we don't become overwhelmed by a flood of | |
| 694 | 693 | // pipelined requests that may never be resolved. | |
| 695 | 694 | if (!socket._paused) { | |
| 696 | - var ws = socket._writableState; | ||
| 695 | + const ws = socket._writableState; | ||
| 697 | 696 | if (ws.needDrain || state.outgoingData >= socket.writableHighWaterMark) { | |
| 698 | 697 | socket._paused = true; | |
| 699 | 698 | // We also need to pause the parser, but don't do that until after | |
0 commit comments