Skip to content
Draft
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
12 changes: 8 additions & 4 deletions lib/XMLHttpRequest.js
Original file line number Diff line number Diff line change
Expand Up @@ -859,19 +859,23 @@ function XMLHttpRequest(opts) {
}

// Error handler for the request
var errorHandler = function(error) {
var errorHandler = function(error, associatedRequest) {
// In the case of https://nodejs.org/api/http.html#requestreusedsocket triggering an ECONNRESET,
// don't fail the xhr request, attempt again.
if (request.reusedSocket && error.code === 'ECONNRESET')
return doRequest(options, responseHandler).on('error', errorHandler);
if (associatedRequest.reusedSocket && error.code === 'ECONNRESET')
{
const retryRequest = doRequest(options, responseHandler)
retryRequest.on('error', (error) => errorHandler(error, retryRequest));
}
handleError(error);
}

var createRequest = function (opt) {
opt = Object.assign(Object.create(null), opt);
if (isSsl) Object.assign(opt, sslOptions);

request = doRequest(opt, responseHandler).on('error', errorHandler);
const httpRequest = doRequest(opt, responseHandler);
request = httpRequest.on('error', (error) => errorHandler(error, httpRequest));

if (opts.autoUnref) {
request.on('socket', function (socket) {
Expand Down
41 changes: 41 additions & 0 deletions tests/abort-request.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
'use strict';

const http = require('http');
const XHR = require('../lib/XMLHttpRequest').XMLHttpRequest;

process.on('uncaughtException', (e) => { console.error('uncaught: ', e); process.exitCode = 1; });
process.on('unhandledRejection', (e) => { console.error('unhandled: ', e); process.exitCode = 2; });

const server = http.createServer((req, res) => {
// never respond to requests - simulate slow server for the abort
});

server.listen(0, '127.0.0.1', () => {
requestAndAbort();
});

function requestAndAbort() {
const url = new URL(`http://127.0.0.1:${server.address().port}`);
const xhr = new XHR();

xhr.open('GET', url);
xhr.send();

setTimeout(() => {
console.log('calling abort');
try {
xhr.abort()
}
catch (e) {
console.error('abort threw:', e);
process.exitCode = 3;
}
console.log('aborted request')
setTimeout(() => {
server.close();
server.closeAllConnections?.();
process.exit();
}, 500);

}, 200);
}
Loading