Merge pull request #1778 from cjihrig/1777

Do not create a duplicate Content-Type header on proxy passthrough
hapijs · Jul 14, 2014 · eacd8f6 · eacd8f6
2 parents b4a3e13 + f63c97d
commit eacd8f6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/lib/proxy.js b/lib/proxy.js
@@ -75,7 +75,7 @@ exports.handler = function (route, options) {
 
             var contentType = req.headers['content-type'];
             if (contentType) {
-                options.headers['Content-Type'] = contentType;
+                options.headers['content-type'] = contentType;
             }
 
             // Send request

diff --git a/test/proxy.js b/test/proxy.js
@@ -1292,5 +1292,24 @@ describe('Proxy', function () {
             });
         });
     });
+
+    it('does not send multiple Content-Type headers on passthrough', function (done) {
+
+        var server = new Hapi.Server();
+        var requestFn = Nipple.request;
+
+        Nipple.request = function (method, url, options, cb) {
+
+            Nipple.request = requestFn;
+            expect(options.headers['content-type']).to.equal('application/json');
+            expect(options.headers['Content-Type']).to.not.exist;
+            cb(new Error('placeholder'));
+        };
+        server.route({ method: 'GET', path: '/test', handler: { proxy: { uri: 'http://localhost', passThrough: true } } });
+        server.inject({ method: 'GET', url: '/test', headers: { 'Content-Type': 'application/json' } }, function (res) {
+
+            done();
+        });
+    });
 });