diff --git a/lib/_http_server.js b/lib/_http_server.js index d25b1270c3d577..edf951f8946c40 100644 --- a/lib/_http_server.js +++ b/lib/_http_server.js @@ -862,27 +862,12 @@ const requestChunkExtensionsTooLargeResponse = Buffer.from( 'Connection: close\r\n\r\n', 'ascii', ); -function warnUnclosedSocket() { - if (warnUnclosedSocket.emitted) { - return; - } - - warnUnclosedSocket.emitted = true; - process.emitWarning( - 'An error event has already been emitted on the socket. ' + - 'Please use the destroy method on the socket while handling ' + - "a 'clientError' event.", - ); -} - function socketOnError(e) { // Ignore further errors this.removeListener('error', socketOnError); if (this.listenerCount('error', noop) === 0) { this.on('error', noop); - } else { - warnUnclosedSocket(); } if (!this.server.emit('clientError', e, this)) { diff --git a/test/parallel/test-http-server-multiple-client-error.js b/test/parallel/test-http-server-multiple-client-error.js new file mode 100644 index 00000000000000..4ac41d295e3d3e --- /dev/null +++ b/test/parallel/test-http-server-multiple-client-error.js @@ -0,0 +1,55 @@ +'use strict'; +const common = require('../common'); + +// Test that the `'clientError'` event can be emitted multiple times even if the +// socket is correctly destroyed and that no warning is raised. + +const assert = require('assert'); +const http = require('http'); +const net = require('net'); + +process.on('warning', common.mustNotCall()); + +function socketListener(socket) { + const firstByte = socket.read(1); + if (firstByte === null) { + socket.once('readable', () => { + socketListener(socket); + }); + return; + } + + socket.unshift(firstByte); + httpServer.emit('connection', socket); +} + +const netServer = net.createServer(socketListener); +const httpServer = http.createServer(common.mustNotCall()); + +httpServer.once('clientError', common.mustCall((err, socket) => { + assert.strictEqual(err.code, 'HPE_INVALID_METHOD'); + assert.strictEqual(err.rawPacket.toString(), 'Q'); + socket.destroy(); + + httpServer.once('clientError', common.mustCall((err) => { + assert.strictEqual(err.code, 'HPE_INVALID_METHOD'); + assert.strictEqual( + err.rawPacket.toString(), + 'WE http://example.com HTTP/1.1\r\n\r\n' + ); + })); +})); + +netServer.listen(0, common.mustCall(() => { + const socket = net.createConnection(netServer.address().port); + + socket.on('connect', common.mustCall(() => { + socket.end('QWE http://example.com HTTP/1.1\r\n\r\n'); + })); + + socket.on('close', () => { + netServer.close(); + }); + + socket.resume(); +})); diff --git a/test/parallel/test-http-socket-error-listeners.js b/test/parallel/test-http-socket-error-listeners.js index f0d220a5d9337a..558bb35882b6ad 100644 --- a/test/parallel/test-http-socket-error-listeners.js +++ b/test/parallel/test-http-socket-error-listeners.js @@ -1,5 +1,3 @@ -// Flags: --no-warnings - 'use strict'; const common = require('../common'); @@ -17,7 +15,7 @@ const net = require('net'); { let i = 0; let socket; - process.on('warning', common.mustCall()); + process.on('warning', common.mustNotCall()); const server = http.createServer(common.mustNotCall());