Retain content-length header for HEAD requests

kanongil · kanongil · commit d9021c1274c0 · 2015-05-21T11:39:47.000+02:00
Fixes hapijs#2540
diff --git a/lib/transmit.js b/lib/transmit.js
@@ -112,7 +112,10 @@ internals.marshal = function (request, next) {
             // Set empty stream
 
             response._payload = new internals.Empty();
-            delete response.headers['content-length'];
+            if (request.method !== 'head') {
+                delete response.headers['content-length'];
+            }
+
             return Auth.response(request, next);               // Must be last in case requires access to headers
         }
 
diff --git a/test/transmit.js b/test/transmit.js
@@ -1656,6 +1656,25 @@ describe('transmission', function () {
             });
         });
 
+        it('head request retains content-length header', function (done) {
+
+            var server = new Hapi.Server();
+            server.connection();
+            var handler = function (request, reply) {
+
+                return reply('x').bytes(1);
+            };
+
+            server.route({ method: 'GET', path: '/', handler: handler });
+
+            server.inject({ method: 'HEAD', url: '/' }, function (res) {
+
+                expect(res.statusCode).to.equal(200);
+                expect(res.headers['content-length']).to.equal(1);
+                done();
+            });
+        });
+
         describe('response range', function () {
 
             var fileStreamHandler = function (request, reply) {
