Replace header key only

Author: pachirel

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

@@ -84,18 +84,13 @@ module.exports = { // <--
    */
   writeHeaders: function writeHeaders(req, res, proxyRes, options) {
     var rewriteCookieDomainConfig = options.cookieDomainRewrite,
-        // In proxyRes.rawHeaders Set-Cookie headers are sparse.
-        // so, we'll collect Set-Cookie headers, and set them in the response as an array.
-        setCookies = [],
+        rawHeaderKeyMap = {},
         setHeader = function(key, header) {
           if (header == undefined) return;
-          if (key.toLowerCase() !== 'set-cookie') {
-            return res.setHeader(String(key).trim(), header);
-          }
-          if (rewriteCookieDomainConfig) {
+          if (rewriteCookieDomainConfig && key.toLowerCase() === 'set-cookie') {
             header = common.rewriteCookieDomain(header, rewriteCookieDomainConfig);
           }
-          setCookies.push(header); // defer to the end when we have all of them
+          res.setHeader(String(key).trim(), header);
         };
 
     if (typeof rewriteCookieDomainConfig === 'string') { //also test for ''
@@ -107,18 +102,17 @@ module.exports = { // <--
     if (proxyRes.rawHeaders != undefined) {
       for (var i = 0; i < proxyRes.rawHeaders.length; i += 2) {
         var key = proxyRes.rawHeaders[i];
-        var header = proxyRes.rawHeaders[i + 1];
-        setHeader(key, header);
+        rawHeaderKeyMap[key.toLowerCase()] = key;
       }
-    } else {
-      Object.keys(proxyRes.headers).forEach(function(key) {
-        var header = proxyRes.headers[key];
-        setHeader(key, header);
-      });
-    }
-    if (setCookies.length) {
-      res.setHeader('Set-Cookie', setCookies.length === 1 ? setCookies[0] : setCookies);
     }
+
+    Object.keys(proxyRes.headers).forEach(function(key) {
+      var header = proxyRes.headers[key];
+      if (preserveHeaderKeyCase) {
+        key = rawHeaderKeyMap[key] || key;
+      }
+      setHeader(key, header);
+    });
   },
 
   /**

test/lib-http-proxy-passes-web-outgoing-test.js

@@ -240,6 +240,14 @@ describe('lib/http-proxy/passes/web-outgoing.js', function () {
         }
       };
       this.rawProxyRes = {
+        headers: {
+          hey: 'hello',
+          how: 'are you?',
+          'set-cookie': [
+            'hello; domain=my.domain; path=/',
+            'there; domain=my.domain; path=/'
+          ]
+        },
         rawHeaders: [
           'Hey', 'hello',
           'How', 'are you?',
@@ -343,6 +351,11 @@ describe('lib/http-proxy/passes/web-outgoing.js', function () {
           'my.special.domain': 'my.special.domain'
         }
       };
+      this.rawProxyRes.headers['set-cookie'] = [
+        'hello-on-my.domain; domain=my.domain; path=/',
+        'hello-on-my.old.domain; domain=my.old.domain; path=/',
+        'hello-on-my.special.domain; domain=my.special.domain; path=/'
+      ];
       this.rawProxyRes.rawHeaders = this.rawProxyRes.rawHeaders.concat([
         'Set-Cookie',
         'hello-on-my.domain; domain=my.domain; path=/',