lib/http-proxy/passes/web-incoming.js

@@ -91,9 +91,7 @@ web_o = Object.keys(web_o).map(function(pass) {
 
   function stream(req, res, options, _, server, clb) {
 
-    //
     // And we begin!
-    //
     if (!clb) {
       server.emit('start', req, res, options.target)
     }
@@ -111,14 +109,24 @@ web_o = Object.keys(web_o).map(function(pass) {
       common.setupOutgoing(options.ssl || {}, options, req)
     );
 
+    // Ensure we abort proxy if request is aborted
+    req.on('aborted', function () {
+      proxyReq.abort();
+    });
+
+    // Handle errors on incoming request as well as it makes sense to
+    req.on('error', proxyError);
+
     // Error Handler
-    proxyReq.on('error', function(err){
+    proxyReq.on('error', proxyError);
+
+    function proxyError (err){
       if (clb) {
         clb(err, req, res);
       } else {
         server.emit('error', err, req, res);
       }
-    });
+    }
 
     (options.buffer || req).pipe(proxyReq);
 
@@ -128,9 +136,7 @@ web_o = Object.keys(web_o).map(function(pass) {
        if(web_o[i](req, res, proxyRes)) { break; }
       }
 
-      //
       // Allow us to listen when the proxy has completed
-      //
       proxyRes.on('end', function () {
         if (!clb) {
           server.emit('end', req, res, proxyRes);

package.json

@@ -1,6 +1,6 @@
 {
   "name"           : "http-proxy",
-  "version"        : "1.1.1",
+  "version"        : "1.1.2",
 
   "repository"     : {
     "type"              : "git",

test/lib-http-proxy-test.js

@@ -78,14 +78,14 @@ describe('lib/http-proxy.js', function() {
       });
 
       source.listen(ports.source);
-      
+
       http.request({
         hostname: '127.0.0.1',
         port: ports.proxy,
         method: 'POST',
         headers: {
           'x-forwarded-for': '127.0.0.1'
-        } 
+        }
       }, function() {}).end();
     });
   });
@@ -105,7 +105,7 @@ describe('lib/http-proxy.js', function() {
       });
 
       source.listen(ports.source);
-      
+
       http.request({
         hostname: '127.0.0.1',
         port: ports.proxy,
@@ -117,7 +117,7 @@ describe('lib/http-proxy.js', function() {
           expect(data.toString()).to.eql('Hello from ' + ports.source);
         });
 
-        res.on('end', function () { 
+        res.on('end', function () {
           source.close();
           proxy._server.close();
           done();
@@ -141,7 +141,7 @@ describe('lib/http-proxy.js', function() {
       })
 
       proxy.listen(ports.proxy);
-      
+
       http.request({
         hostname: '127.0.0.1',
         port: ports.proxy,
@@ -159,6 +159,11 @@ describe('lib/http-proxy.js', function() {
         timeout: 3
       }).listen(ports.proxy);
 
+      proxy.on('error', function (e) {
+        expect(e).to.be.an(Error);
+        expect(e.code).to.be.eql('ECONNRESET');
+      });
+
       var source = http.createServer(function(req, res) {
         setTimeout(function () {
           res.end('At this point the socket should be closed');
@@ -207,7 +212,7 @@ describe('lib/http-proxy.js', function() {
   //     proxy.ee.on('http-proxy:**', function (uno, dos, tres) {
   //       events.push(this.event);
   //     })
-      
+
   //     http.request({
   //       hostname: '127.0.0.1',
   //       port: '8081',
@@ -314,4 +319,4 @@ describe('lib/http-proxy.js', function() {
       })
     });
   })
-});
+});