headers: avoid sending null content-type

This commit prevents a null content-type header from being sent back. Fixes: #4133 Refs: ed0688c
hapijs · Aug 9, 2020 · f7e9193 · f7e9193
1 parent 5c08509
commit f7e9193
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/lib/headers.js b/lib/headers.js
@@ -122,7 +122,7 @@ exports.type = function (request) {
 
     const response = request.response;
     const type = response.contentType;
-    if (type !== response.headers['content-type']) {
+    if (type !== null && type !== response.headers['content-type']) {
         response.type(type);
     }
 };

diff --git a/test/headers.js b/test/headers.js
@@ -523,5 +523,15 @@ describe('Headers', () => {
             const res = await server.inject('/?callback=me');
             expect(res.payload).to.equal('test');
         });
+
+        it('does not set content-type by default on 204 response', async () => {
+
+            const server = Hapi.server();
+            server.route({ method: 'GET', path: '/', handler: (request, h) => h.response().code(204) });
+
+            const res = await server.inject('/');
+            expect(res.statusCode).to.equal(204);
+            expect(res.headers['content-type']).to.equal(undefined);
+        });
     });
 });