revert

Author: thornjad

bin/http-server

@@ -11,7 +11,6 @@ var colors     = require('colors/safe'),
     argv       = require('optimist')
       .boolean('cors')
       .boolean('log-ip')
-      .boolean('server-header')
       .argv,
     pjson      = require('../package.json');
 
@@ -57,7 +56,6 @@ if (argv.h || argv.help) {
     '',
     '  -r --robots        Respond to /robots.txt [User-agent: *\\nDisallow: /]',
     '  --no-dotfiles      Do not show dotfiles',
-    '  --no-server-header  Hide the "server" header which identifies ecstatic',
     '  -h --help          Print this list and exit.',
     '  -v --version       Print the version and exit.'
   ].join('\n'));
@@ -134,7 +132,6 @@ function listen(port) {
     logFn: logger.request,
     proxy: proxy,
     showDotfiles: argv.dotfiles,
-    serverHeader: argv['server-header'],
     username: argv.username || process.env.NODE_HTTP_SERVER_USERNAME,
     password: argv.password || process.env.NODE_HTTP_SERVER_PASSWORD
   };

lib/http-server.js

@@ -80,7 +80,6 @@ function HttpServer(options) {
   this.showDir = options.showDir !== 'false';
   this.autoIndex = options.autoIndex !== 'false';
   this.showDotfiles = options.showDotfiles;
-  this.serverHeader = options.serverHeader;
   this.gzip = options.gzip === true;
   this.brotli = options.brotli === true;
   this.contentType = options.contentType || 'application/octet-stream';
@@ -154,7 +153,6 @@ function HttpServer(options) {
     cache: this.cache,
     showDir: this.showDir,
     showDotfiles: this.showDotfiles,
-    serverHeader: this.serverHeader,
     autoIndex: this.autoIndex,
     defaultExt: this.ext,
     gzip: this.gzip,

test/http-server-test.js

@@ -16,7 +16,6 @@ vows.describe('http-server').addBatch({
       var server = httpServer.createServer({
         root: root,
         robots: true,
-        serverHeader: false,
         headers: {
           'Access-Control-Allow-Origin': '*',
           'Access-Control-Allow-Credentials': 'true'
@@ -80,14 +79,6 @@ vows.describe('http-server').addBatch({
         assert.equal(res.headers['access-control-allow-credentials'], 'true');
       }
     },
-    'and serverHeaderis disabled': {
-      topic: function () {
-        request('http://127.0.0.1:8080/', this.callback);
-      },
-      'should not respond with headers from ecstatic': function (res) {
-        assert.isFalse('server' in res.headers);
-      }
-    },
     'and the server is set to proxy port 8081 to 8080, ': {
       topic: function () {
         var proxyServer = httpServer.createServer({