summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniele Belardi <dwon.dnl@gmail.com>2020-12-16 08:39:16 +0100
committerNode.js GitHub Bot <github-bot@iojs.org>2020-12-17 10:31:10 +0000
commit8154e47e2b407a906f2c1270e5fc76fe466cc886 (patch)
treec617d7566cc01d698e06600b7ec5a26ac0dd1dbf
parenta6bf74eac00516fd0767b585c8f304857dddd2aa (diff)
downloadnode-new-8154e47e2b407a906f2c1270e5fc76fe466cc886.tar.gz
http: add test for incomingmessage destroy
Test uncaught exceptions when destroying IncomingMessage. PR-URL: https://github.com/nodejs/node/pull/33035 Refs: https://github.com/nodejs/node/issues/30625 Reviewed-By: Robert Nagy <ronagy@icloud.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
-rw-r--r--lib/_http_incoming.js11
-rw-r--r--test/parallel/test-http-client-incomingmessage-destroy.js25
-rw-r--r--test/parallel/test-http-server-incomingmessage-destroy.js25
3 files changed, 55 insertions, 6 deletions
diff --git a/lib/_http_incoming.js b/lib/_http_incoming.js
index 462b08d92a..22ab591b7a 100644
--- a/lib/_http_incoming.js
+++ b/lib/_http_incoming.js
@@ -361,14 +361,13 @@ IncomingMessage.prototype._dump = function _dump() {
}
};
-function onError(instance, error, cb) {
+function onError(self, error, cb) {
// This is to keep backward compatible behavior.
- // An error is emitted only if there are listeners attached to
- // the event.
- if (instance.listenerCount('error') > 0) {
- cb(error);
- } else {
+ // An error is emitted only if there are listeners attached to the event.
+ if (self.listenerCount('error') === 0) {
cb();
+ } else {
+ cb(error);
}
}
diff --git a/test/parallel/test-http-client-incomingmessage-destroy.js b/test/parallel/test-http-client-incomingmessage-destroy.js
new file mode 100644
index 0000000000..a0823d3778
--- /dev/null
+++ b/test/parallel/test-http-client-incomingmessage-destroy.js
@@ -0,0 +1,25 @@
+'use strict';
+
+const common = require('../common');
+const { createServer, get } = require('http');
+const assert = require('assert');
+
+const server = createServer(common.mustCall((req, res) => {
+ res.writeHead(200);
+ res.write('Part of res.');
+}));
+
+function onUncaught(error) {
+ assert.strictEqual(error.message, 'Destroy test');
+ server.close();
+}
+
+process.on('uncaughtException', common.mustCall(onUncaught));
+
+server.listen(0, () => {
+ get({
+ port: server.address().port
+ }, common.mustCall((res) => {
+ res.destroy(new Error('Destroy test'));
+ }));
+});
diff --git a/test/parallel/test-http-server-incomingmessage-destroy.js b/test/parallel/test-http-server-incomingmessage-destroy.js
new file mode 100644
index 0000000000..cfe7e4feec
--- /dev/null
+++ b/test/parallel/test-http-server-incomingmessage-destroy.js
@@ -0,0 +1,25 @@
+'use strict';
+
+const common = require('../common');
+const { createServer, get } = require('http');
+const assert = require('assert');
+
+const server = createServer(common.mustCall((req, res) => {
+ req.destroy(new Error('Destroy test'));
+}));
+
+function onUncaught(error) {}
+
+process.on('uncaughtException', common.mustNotCall(onUncaught));
+
+server.listen(0, common.mustCall(() => {
+ get({
+ port: server.address().port
+ }, (res) => {
+ res.resume();
+ }).on('error', (error) => {
+ assert.strictEqual(error.message, 'socket hang up');
+ assert.strictEqual(error.code, 'ECONNRESET');
+ server.close();
+ });
+}));