diff --git a/lib/http-proxy/passes/web-incoming.js b/lib/http-proxy/passes/web-incoming.js index 4070eb316..c9e72d8f1 100644 --- a/lib/http-proxy/passes/web-incoming.js +++ b/lib/http-proxy/passes/web-incoming.js @@ -127,17 +127,14 @@ web_o = Object.keys(web_o).map(function(pass) { proxyReq.abort(); }); - // Handle errors on incoming request as well as it makes sense to - req.on('error', proxyError); - // Error Handler proxyReq.on('error', proxyError); function proxyError (err){ if (clb) { - clb(err, req, res, options.target); + clb(err, proxyReq, options.target); } else { - server.emit('error', err, req, res, options.target); + server.emit('error', err, proxyReq, options.target); } } diff --git a/test/lib-http-proxy-passes-web-incoming-test.js b/test/lib-http-proxy-passes-web-incoming-test.js index cf9bf6b75..ec4fa84c2 100644 --- a/test/lib-http-proxy-passes-web-incoming-test.js +++ b/test/lib-http-proxy-passes-web-incoming-test.js @@ -144,11 +144,9 @@ describe('#createProxyServer.web() using own http server', function () { var proxyServer = http.createServer(requestHandler); function requestHandler(req, res) { - proxy.once('error', function (err, errReq, errRes) { + proxy.once('error', function (err) { proxyServer.close(); expect(err).to.be.an(Error); - expect(errReq).to.be.equal(req); - expect(errRes).to.be.equal(res); expect(err.code).to.be('ECONNREFUSED'); done(); }); @@ -177,11 +175,9 @@ describe('#createProxyServer.web() using own http server', function () { var started = new Date().getTime(); function requestHandler(req, res) { - proxy.once('error', function (err, errReq, errRes) { + proxy.once('error', function (err) { proxyServer.close(); expect(err).to.be.an(Error); - expect(errReq).to.be.equal(req); - expect(errRes).to.be.equal(res); expect(new Date().getTime() - started).to.be.greaterThan(99); expect(err.code).to.be('ECONNRESET'); done(); @@ -217,11 +213,9 @@ describe('#createProxyServer.web() using own http server', function () { var started = new Date().getTime(); function requestHandler(req, res) { - proxy.once('error', function (err, errReq, errRes) { + proxy.once('error', function (err) { proxyServer.close(); expect(err).to.be.an(Error); - expect(errReq).to.be.equal(req); - expect(errRes).to.be.equal(res); expect(err.code).to.be('ECONNRESET'); doneOne(); });