diff options
| author | Anna Henningsen <anna@addaleax.net> | 2019-11-21 00:14:14 +0100 |
|---|---|---|
| committer | Anna Henningsen <anna@addaleax.net> | 2019-11-29 16:27:35 +0100 |
| commit | 487177954201ee098ecbf5027473b238187cee22 (patch) | |
| tree | 5d8cb927a571f0f4a832a451eae0968383fa863d /lib | |
| parent | a7d031bf5ac9825e5cd645a0a91c4583b7c6f6cd (diff) | |
| download | android-node-v8-487177954201ee098ecbf5027473b238187cee22.tar.gz android-node-v8-487177954201ee098ecbf5027473b238187cee22.tar.bz2 android-node-v8-487177954201ee098ecbf5027473b238187cee22.zip | |
http: set socket.server unconditionally
This is useful for situations in which the socket was not
created for HTTP, e.g. when using arbitrary `Duplex` streams.
(The added test fails because previously, `socket.server.emit()`
would not work for emitting the `clientError` event, as
`socket.server` was `undefined`.)
PR-URL: https://github.com/nodejs/node/pull/30571
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/_http_server.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/_http_server.js b/lib/_http_server.js index bb9e654668..3d114d8711 100644 --- a/lib/_http_server.js +++ b/lib/_http_server.js @@ -363,8 +363,7 @@ function connectionListenerInternal(server, socket) { // Ensure that the server property of the socket is correctly set. // See https://github.com/nodejs/node/issues/13435 - if (socket.server === null) - socket.server = server; + socket.server = server; // If the user has added a listener to the server, // request, or response, then it's their responsibility. |