diff --git a/lib/core/aliases.json b/lib/core/aliases.json index 94dcf473..53a22a56 100644 --- a/lib/core/aliases.json +++ b/lib/core/aliases.json @@ -8,7 +8,6 @@ "handleError": [ "handleError", "handleerror" ], "cors": [ "cors", "CORS" ], "headers": [ "H", "header", "headers" ], - "serverHeader": [ "serverHeader", "serverheader", "server-header" ], "contentType": [ "contentType", "contenttype", "content-type" ], "mimeType": [ "mimetype", diff --git a/lib/core/defaults.json b/lib/core/defaults.json index d890da8f..d919f292 100644 --- a/lib/core/defaults.json +++ b/lib/core/defaults.json @@ -11,7 +11,6 @@ "brotli": false, "defaultExt": ".html", "handleError": true, - "serverHeader": true, "contentType": "application/octet-stream", "weakEtags": true, "weakCompare": true, diff --git a/lib/core/index.js b/lib/core/index.js index 030bff62..35a4136d 100644 --- a/lib/core/index.js +++ b/lib/core/index.js @@ -101,7 +101,6 @@ module.exports = function createMiddleware(_dir, _options) { let defaultExt = opts.defaultExt; const handleError = opts.handleError; const headers = opts.headers; - const serverHeader = opts.serverHeader; const weakEtags = opts.weakEtags; const handleOptionsMethod = opts.handleOptionsMethod; @@ -196,11 +195,6 @@ module.exports = function createMiddleware(_dir, _options) { gzippedFile = `${file}.gz`; brotliFile = `${file}.br`; - if (serverHeader !== false) { - // Set common headers. - res.setHeader('server', `http-server-${version}`); - } - Object.keys(headers).forEach((key) => { res.setHeader(key, headers[key]); }); diff --git a/lib/core/opts.js b/lib/core/opts.js index d4b170d5..c0365ba8 100644 --- a/lib/core/opts.js +++ b/lib/core/opts.js @@ -18,7 +18,6 @@ module.exports = (opts) => { let defaultExt = defaults.defaultExt; let handleError = defaults.handleError; const headers = {}; - let serverHeader = defaults.serverHeader; let contentType = defaults.contentType; let mimeTypes; let weakEtags = defaults.weakEtags; @@ -140,14 +139,6 @@ module.exports = (opts) => { } }); - aliases.serverHeader.some((k) => { - if (isDeclared(k)) { - serverHeader = opts[k]; - return true; - } - return false; - }); - aliases.contentType.some((k) => { if (isDeclared(k)) { contentType = opts[k]; @@ -203,7 +194,6 @@ module.exports = (opts) => { brotli, handleError, headers, - serverHeader, contentType, mimeTypes, weakEtags, diff --git a/test/server-header.test.js b/test/server-header.test.js deleted file mode 100644 index dd96bcab..00000000 --- a/test/server-header.test.js +++ /dev/null @@ -1,40 +0,0 @@ -'use strict'; - -const test = require('tap').test; -const ecstatic = require('../lib/core'); -const http = require('http'); -const request = require('request'); - -test('serverHeader should exist', (t) => { - t.plan(2); - - const server = http.createServer(ecstatic(`${__dirname}/public/subdir`)); - - t.on('end', () => { server.close(); }); - - server.listen(0, () => { - const port = server.address().port; - request.get(`http://localhost:${port}`, (err, res) => { - t.ifError(err); - t.equal(res.headers.server, `http-server-${ecstatic.version}`); - }); - }); -}); - -test('serverHeader should not exist', (t) => { - t.plan(2); - - const server = http.createServer(ecstatic(`${__dirname}/public/subdir`, { - serverHeader: false, - })); - - t.on('end', () => { server.close(); }); - - server.listen(0, () => { - const port = server.address().port; - request.get(`http://localhost:${port}`, (err, res) => { - t.ifError(err); - t.equal(res.headers.server, undefined); - }); - }); -});