1 files changed, 22 insertions, 12 deletions
diff --git a/lib/nodeserver/server.js b/lib/nodeserver/server.js
index 08f13a99..f91f6afa 100644
--- a/lib/nodeserver/server.js
+++ b/lib/nodeserver/server.js
@@ -8,10 +8,8 @@ var DEFAULT_PORT = 8000;
 
 function main(argv) {
   new HttpServer({
-    'GET': (function() { 
-      var servlet = new StaticServlet();
-      return servlet.handleRequest.bind(servlet)
-    })()
+    'GET': createServlet(StaticServlet),
+    'HEAD': createServlet(StaticServlet)
   }).start(Number(argv[2]) || DEFAULT_PORT);
 }
 
@@ -22,6 +20,11 @@ function escapeHtml(value) {
     replace('"', '&quot;');
 }
 
+function createServlet(Class) {
+  var servlet = new Class();
+  return servlet.handleRequest.bind(servlet);
+}
+
 /**
  * An Http server implementation that uses a map of methods to decide
  * action routing.
@@ -61,11 +64,10 @@ HttpServer.prototype.handleRequest_ = function(req, res) {
   }
 };
 
-
 /**
  * Handles static content.
  */
-function  StaticServlet() {}
+function StaticServlet() {}
 
 StaticServlet.MimeMap = {
   'txt': 'text/plain',
@@ -164,13 +166,17 @@ StaticServlet.prototype.sendFile_ = function(req, res, path) {
     'Content-Type': StaticServlet.
       MimeMap[path.split('.').pop()] || 'text/plain'
   });
-  file.on('data', res.write.bind(res));
-  file.on('close', function() {
+  if (req.method === 'HEAD') {
     res.end();
-  });
-  file.on('error', function(error) {
-    self.sendError_(req, res, error);
-  });
+  } else {
+    file.on('data', res.write.bind(res));
+    file.on('close', function() {
+      res.end();
+    });
+    file.on('error', function(error) {
+      self.sendError_(req, res, error);
+    });
+  }
 };
 
 StaticServlet.prototype.sendDirectory_ = function(req, res, path) {
@@ -207,6 +213,10 @@ StaticServlet.prototype.writeDirectoryIndex_ = function(req, res, path, files) {
   res.writeHead(200, {
     'Content-Type': 'text/html'
   });
+  if (req.method === 'HEAD') {
+    res.end();
+    return;
+  }
   res.write('<!doctype html>\n');
   res.write('<title>' + escapeHtml(path) + '</title>\n');
   res.write('<style>\n');