Remove charset=utf-8 default

Fixes jfhbrook#220
BigBlueHat · Jun 19, 2018 · e8ac599 · e8ac599
1 parent 609f1c9
commit e8ac599
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/lib/ecstatic.js b/lib/ecstatic.js
@@ -240,7 +240,7 @@ module.exports = function createMiddleware(_dir, _options) {
       let stream = null;
 
       if (contentType) {
-        charSet = mime.charsets.lookup(contentType, 'utf-8');
+        charSet = mime.charsets.lookup(contentType);
         if (charSet) {
           contentType += `; charset=${charSet}`;
         }

diff --git a/test/cli.js b/test/cli.js
@@ -115,7 +115,7 @@ test('setting mimeTypes via cli - directly', (t) => {
     t.pass('ecstatic should be started');
     checkServerIsRunning(`${defaultUrl}:${port}/custom_mime_type.opml`, t, (err, res) => {
       t.error(err);
-      t.equal(res.headers['content-type'], 'application/x-my-type; charset=utf-8');
+      t.equal(res.headers['content-type'], 'application/x-my-type');
     });
   });
 });
diff --git a/test/custom-content-type-file-secret.js b/test/custom-content-type-file-secret.js
@@ -24,7 +24,7 @@ test('custom contentType via .types file', (t) => {
     request.get(`http://localhost:${port}/custom_mime_type.opml`, (err, res) => {
       t.ifError(err);
       t.equal(res.statusCode, 200, 'custom_mime_type.opml should be found');
-      t.equal(res.headers['content-type'], 'application/secret; charset=utf-8');
+      t.equal(res.headers['content-type'], 'application/secret');
       server.close(() => { t.end(); });
     });
   });

diff --git a/test/custom-content-type-file.js b/test/custom-content-type-file.js
@@ -40,7 +40,7 @@ test('custom contentType via .types file', (t) => {
     request.get(`http://localhost:${port}/custom_mime_type.opml`, (err, res) => {
       t.ifError(err);
       t.equal(res.statusCode, 200, 'custom_mime_type.opml should be found');
-      t.equal(res.headers['content-type'], 'application/foo; charset=utf-8');
+      t.equal(res.headers['content-type'], 'application/foo');
       server.close(() => { t.end(); });
     });
   });

diff --git a/test/custom-content-type.js b/test/custom-content-type.js
@@ -26,7 +26,7 @@ test('custom contentType', (t) => {
     request.get(`http://localhost:${port}/custom_mime_type.opml`, (err, res) => {
       t.ifError(err);
       t.equal(res.statusCode, 200, 'custom_mime_type.opml should be found');
-      t.equal(res.headers['content-type'], 'application/jon; charset=utf-8');
+      t.equal(res.headers['content-type'], 'application/jon');
       server.close(() => { t.end(); });
     });
   });