Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions lib/_http_client.js
Original file line number Diff line number Diff line change
Expand Up @@ -801,13 +801,15 @@ function onSocketNT(req, socket, err) {
req.emit('close');
}

if (!err && req.agent) {
socket?.emit('free');
} else if (socket) {
finished(socket.destroy(err || req[kError]), (er) => {
_destroy(req, er || err);
});
return;
if (socket) {
if (!err && req.agent && !socket.destroyed) {
socket.emit('free');
} else {
finished(socket.destroy(err || req[kError]), (er) => {
_destroy(req, er || err);
});
return;
}
}

_destroy(req, err || req[kError]);
Expand Down
32 changes: 32 additions & 0 deletions test/parallel/test-http-client-abort3.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
'use strict';

const common = require('../common');
const http = require('http');
const net = require('net');

function createConnection() {
const socket = new net.Socket();

process.nextTick(function() {
socket.destroy(new Error('Oops'));
});

return socket;
}

{
const req = http.get({ createConnection });

req.on('error', common.expectsError({ name: 'Error', message: 'Oops' }));
req.abort();
}

{
class CustomAgent extends http.Agent {}
CustomAgent.prototype.createConnection = createConnection;

const req = http.get({ agent: new CustomAgent() });

req.on('error', common.expectsError({ name: 'Error', message: 'Oops' }));
req.abort();
}