Fix from http-party#1542

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

@@ -1,10 +1,10 @@
-var httpNative   = require('http'),
-    httpsNative  = require('https'),
-    web_o  = require('./web-outgoing'),
-    common = require('../common'),
-    followRedirects = require('follow-redirects');
+var httpNative = require('http'),
+  httpsNative = require('https'),
+  web_o = require('./web-outgoing'),
+  common = require('../common'),
+  followRedirects = require('follow-redirects');
 
-web_o = Object.keys(web_o).map(function(pass) {
+web_o = Object.keys(web_o).map(function (pass) {
   return web_o[pass];
 });
 
@@ -32,8 +32,8 @@ module.exports = {
    */
 
   deleteLength: function deleteLength(req, res, options) {
-    if((req.method === 'DELETE' || req.method === 'OPTIONS')
-       && !req.headers['content-length']) {
+    if ((req.method === 'DELETE' || req.method === 'OPTIONS')
+      && !req.headers['content-length']) {
       req.headers['content-length'] = '0';
       delete req.headers['transfer-encoding'];
     }
@@ -50,7 +50,7 @@ module.exports = {
    */
 
   timeout: function timeout(req, res, options) {
-    if(options.timeout) {
+    if (options.timeout) {
       req.socket.setTimeout(options.timeout);
     }
   },
@@ -66,16 +66,16 @@ module.exports = {
    */
 
   XHeaders: function XHeaders(req, res, options) {
-    if(!options.xfwd) return;
+    if (!options.xfwd) return;
 
     var encrypted = req.isSpdy || common.hasEncryptedConnection(req);
     var values = {
-      for  : req.connection.remoteAddress || req.socket.remoteAddress,
-      port : common.getPort(req),
+      for: req.connection.remoteAddress || req.socket.remoteAddress,
+      port: common.getPort(req),
       proto: encrypted ? 'https' : 'http'
     };
 
-    ['for', 'port', 'proto'].forEach(function(header) {
+    ['for', 'port', 'proto'].forEach(function (header) {
       req.headers['x-forwarded-' + header] =
         (req.headers['x-forwarded-' + header] || '') +
         (req.headers['x-forwarded-' + header] ? ',' : '') +
@@ -106,7 +106,7 @@ module.exports = {
     var http = agents.http;
     var https = agents.https;
 
-    if(options.forward) {
+    if (options.forward) {
       // If forward enable, so just pipe the request
       var forwardReq = (options.forward.protocol === 'https:' ? https : http).request(
         common.setupOutgoing(options.ssl || {}, options, req, 'forward')
@@ -119,7 +119,7 @@ module.exports = {
       forwardReq.on('error', forwardError);
 
       (options.buffer || req).pipe(forwardReq);
-      if(!options.target) { return res.end(); }
+      if (!options.target) { return res.end(); }
     }
 
     // Request initalization
@@ -128,17 +128,17 @@ module.exports = {
     );
 
     // Enable developers to modify the proxyReq before headers are sent
-    proxyReq.on('socket', function(socket) {
-      if(server && !proxyReq.getHeader('expect')) {
+    proxyReq.on('socket', function (socket) {
+      if (server && !proxyReq.getHeader('expect')) {
         server.emit('proxyReq', proxyReq, req, res, options);
       }
     });
 
     // allow outgoing socket to timeout so that we could
     // show an error page at the initial request
-    if(options.proxyTimeout) {
-      proxyReq.setTimeout(options.proxyTimeout, function() {
-         proxyReq.abort();
+    if (options.proxyTimeout) {
+      proxyReq.setTimeout(options.proxyTimeout, function () {
+        proxyReq.abort();
       });
     }
 
@@ -154,7 +154,7 @@ module.exports = {
 
     function createErrorHandler(proxyReq, url) {
       return function proxyError(err) {
-        if (req.socket.destroyed && err.code === 'ECONNRESET') {
+        if (req.aborted && err.code === 'ECONNRESET') {
           server.emit('econnreset', err, req, res, url);
           return proxyReq.abort();
         }
@@ -169,12 +169,12 @@ module.exports = {
 
     (options.buffer || req).pipe(proxyReq);
 
-    proxyReq.on('response', function(proxyRes) {
-      if(server) { server.emit('proxyRes', proxyRes, req, res); }
+    proxyReq.on('response', function (proxyRes) {
+      if (server) { server.emit('proxyRes', proxyRes, req, res); }
 
-      if(!res.headersSent && !options.selfHandleResponse) {
-        for(var i=0; i < web_o.length; i++) {
-          if(web_o[i](req, res, proxyRes, options)) { break; }
+      if (!res.headersSent && !options.selfHandleResponse) {
+        for (var i = 0; i < web_o.length; i++) {
+          if (web_o[i](req, res, proxyRes, options)) { break; }
         }
       }
 

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "http-proxy",
-  "version": "1.18.1",
+  "name": "@oplabs/http-proxy",
+  "version": "1.18.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/http-party/node-http-proxy.git"
@@ -38,4 +38,4 @@
     "node": ">=8.0.0"
   },
   "license": "MIT"
-}
+}