diff options
author | Anatoli Papirovski <apapirovski@mac.com> | 2017-10-16 18:37:14 -0400 |
---|---|---|
committer | Anatoli Papirovski <apapirovski@mac.com> | 2017-10-19 13:54:14 -0400 |
commit | 3c0ebf5aca935ebacf4f5b862c2ad4fb67614bcb (patch) | |
tree | 84859056d1bd5a434d64e7baa4f0f1aca0f96bad /lib/_http_server.js | |
parent | bf1bacef6bc49fa39a272ca63b7635de3e5e7f08 (diff) | |
download | android-node-v8-3c0ebf5aca935ebacf4f5b862c2ad4fb67614bcb.tar.gz android-node-v8-3c0ebf5aca935ebacf4f5b862c2ad4fb67614bcb.tar.bz2 android-node-v8-3c0ebf5aca935ebacf4f5b862c2ad4fb67614bcb.zip |
tools: enable additional eslint rules
Enable additional rules that node either already adheres to
or it makes sense to do so going forward: for-direction,
accessor-pairs, no-lonely-if and symbol-description.
Fix all instances of no-lonely-if in lib & test and disable
accessor-pairs in test-util-inspect.
PR-URL: https://github.com/nodejs/node/pull/16243
Refs: https://eslint.org/docs/rules/for-direction
Refs: https://eslint.org/docs/rules/accessor-pairs
Refs: https://eslint.org/docs/rules/no-lonely-if
Refs: https://eslint.org/docs/rules/symbol-description
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'lib/_http_server.js')
-rw-r--r-- | lib/_http_server.js | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/_http_server.js b/lib/_http_server.js index a133c2c153..cb949cb07e 100644 --- a/lib/_http_server.js +++ b/lib/_http_server.js @@ -433,8 +433,8 @@ function socketOnEnd(server, socket, parser, state) { state.outgoing[state.outgoing.length - 1]._last = true; } else if (socket._httpMessage) { socket._httpMessage._last = true; - } else { - if (socket.writable) socket.end(); + } else if (socket.writable) { + socket.end(); } } @@ -602,13 +602,11 @@ function parserOnIncoming(server, socket, state, req, keepAlive) { res.writeContinue(); server.emit('request', req, res); } + } else if (server.listenerCount('checkExpectation') > 0) { + server.emit('checkExpectation', req, res); } else { - if (server.listenerCount('checkExpectation') > 0) { - server.emit('checkExpectation', req, res); - } else { - res.writeHead(417); - res.end(); - } + res.writeHead(417); + res.end(); } } else { server.emit('request', req, res); |