Skip to content

add request source to error handler #1335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add request source to error handler #1335

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 11 additions & 10 deletions lib/http-proxy/passes/web-incoming.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ module.exports = {

// error handler (e.g. ECONNRESET, ECONNREFUSED)
// Handle errors on incoming request as well as it makes sense to
var forwardError = createErrorHandler(forwardReq, options.forward);
req.on('error', forwardError);
forwardReq.on('error', forwardError);
var forwardError = (reqSource) => createErrorHandler(forwardReq, options.forward, reqSource);
req.on('error', forwardError('client'));
forwardReq.on('error', forwardError('target'));

(options.buffer || req).pipe(forwardReq);
if(!options.target) { return res.end(); }
Expand Down Expand Up @@ -146,21 +146,22 @@ module.exports = {
});

// handle errors in proxy and incoming request, just like for forward proxy
var proxyError = createErrorHandler(proxyReq, options.target);
req.on('error', proxyError);
proxyReq.on('error', proxyError);
var proxyError = (reqSource) => createErrorHandler(proxyReq, options.target, reqSource);

req.on('error', proxyError('client'));
proxyReq.on('error', proxyError('target'));

function createErrorHandler(proxyReq, url) {
function createErrorHandler(proxyReq, url, reqSource) {
return function proxyError(err) {
if (req.socket.destroyed && err.code === 'ECONNRESET') {
if (req.socket.destroyed && err.code === 'ECONNRESET' && reqSource === 'client') {
server.emit('econnreset', err, req, res, url);
return proxyReq.abort();
}

if (clb) {
clb(err, req, res, url);
clb(err, req, res, url, reqSource);
} else {
server.emit('error', err, req, res, url);
server.emit('error', err, req, res, url, reqSource);
}
}
}
Expand Down