1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

http: add an alias at addListener on Server connection socket

Browse Source 
Fixes: https://github.com/nodejs/node/issues/27199

PR-URL: https://github.com/nodejs/node/pull/27325
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
This commit is contained in:
himself65 2019-04-20 22:42:27 +08:00 committed by Anna Henningsen
parent 3d9d1ade2a
commit be26f6e9d5
No known key found for this signature in database
GPG Key ID: 9C63F3A6CD2AD8F9
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/_http_server.js
View File

@ -406,6 +406,7 @@ function connectionListenerInternal(server, socket) {
// Override on to unconsume on `data`, `readable` listeners // Override on to unconsume on `data`, `readable` listeners
socket.on = socketOnWrap; socket.on = socketOnWrap;
socket.addListener = socket.on;
// We only consume the socket if it has never been consumed before. // We only consume the socket if it has never been consumed before.
if (socket._handle && socket._handle.isStreamBase && if (socket._handle && socket._handle.isStreamBase &&
@ -756,7 +757,9 @@ function unconsume(parser, socket) {
function socketOnWrap(ev, fn) { function socketOnWrap(ev, fn) {
const res = net.Socket.prototype.on.call(this, ev, fn); const res = net.Socket.prototype.on.call(this, ev, fn);
if (!this.parser) { if (!this.parser) {
this.prependListener = net.Socket.prototype.prependListener;
this.on = net.Socket.prototype.on; this.on = net.Socket.prototype.on;
this.addListener = this.on;
return res; return res;
} }

4
test/parallel/test-http-server-unconsume.js
View File

@ -14,6 +14,10 @@ const server = http.createServer(function(req, res) {
received += data; received += data;
}); });
assert.strictEqual(req.socket.on, req.socket.addListener);
assert.strictEqual(req.socket.prependListener,
net.Socket.prototype.prependListener);
server.close(); server.close();
}).listen(0, function() { }).listen(0, function() {
const socket = net.connect(this.address().port, function() { const socket = net.connect(this.address().port, function() {