Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 1d1d136

Browse filesBrowse files
committed
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: #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>
1 parent d257448 commit 1d1d136
Copy full SHA for 1d1d136

File tree

Expand file treeCollapse file tree

2 files changed

+15
-2
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

2 files changed

+15
-2
lines changed
Open diff view settings
Collapse file

‎lib/_http_server.js‎

Copy file name to clipboardExpand all lines: lib/_http_server.js
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,7 @@ function connectionListenerInternal(server, socket) {
365365

366366
// Ensure that the server property of the socket is correctly set.
367367
// See https://github.com/nodejs/node/issues/13435
368-
if (socket.server === null)
369-
socket.server = server;
368+
socket.server = server;
370369

371370
// If the user has added a listener to the server,
372371
// request, or response, then it's their responsibility.
Collapse file

‎test/parallel/test-http-generic-streams.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-http-generic-streams.js
+14Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,3 +138,17 @@ const MakeDuplexPair = require('../common/duplexpair');
138138
req.write(testData);
139139
req.end();
140140
}
141+
142+
// Test 5: The client sends garbage.
143+
{
144+
const server = http.createServer(common.mustNotCall());
145+
146+
const { clientSide, serverSide } = MakeDuplexPair();
147+
server.emit('connection', serverSide);
148+
149+
server.on('clientError', common.mustCall());
150+
151+
// Send something that is not an HTTP request.
152+
clientSide.end(
153+
'I’m reading a book about anti-gravity. It’s impossible to put down!');
154+
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.