Setting contentType for HEAD requests

Author: megoth

lib/handlers/get.js

@@ -76,7 +76,9 @@ function handler (req, res, next) {
     // Till here it must exist
     if (!includeBody) {
       debug('HEAD only')
-      res.sendStatus(200)
+      contentType = mime.contentType(_path.extname(path))
+      res.setHeader('Content-Type', contentType)
+      res.status(200).send('OK')
       return next()
     }
 
@@ -85,8 +87,8 @@ function handler (req, res, next) {
       let mimeTypeByExt = mime.lookup(_path.basename(path))
       let isHtmlResource = mimeTypeByExt && mimeTypeByExt.includes('html')
       let useDataBrowser = ldp.dataBrowserPath && (
-          container ||
-          RDFs.includes(contentType) && !isHtmlResource && !ldp.suppressDataBrowser)
+        container ||
+        RDFs.includes(contentType) && !isHtmlResource && !ldp.suppressDataBrowser)
 
       if (useDataBrowser) {
         res.set('Content-Type', 'text/html')
@@ -160,7 +162,7 @@ function globHandler (req, res, next) {
     debugGlob('found matches ' + matches)
     Promise.all(matches.map(match => new Promise((resolve, reject) => {
       const baseUri = reqOrigin + '/' + match.substr(root.length)
-      fs.readFile(match, {encoding: 'utf8'}, function (err, fileData) {
+      fs.readFile(match, { encoding: 'utf8' }, function (err, fileData) {
         if (err) {
           debugGlob('error ' + err)
           return resolve()
@@ -182,15 +184,15 @@ function globHandler (req, res, next) {
         })
       })
     })))
-    .then(() => {
-      const data = $rdf.serialize(undefined, globGraph, requestUri, 'text/turtle')
-      // TODO this should be added as a middleware in the routes
-      res.setHeader('Content-Type', 'text/turtle')
-      debugGlob('returning turtle')
-
-      res.send(data)
-      return next()
-    })
+      .then(() => {
+        const data = $rdf.serialize(undefined, globGraph, requestUri, 'text/turtle')
+        // TODO this should be added as a middleware in the routes
+        res.setHeader('Content-Type', 'text/turtle')
+        debugGlob('returning turtle')
+
+        res.send(data)
+        return next()
+      })
   })
 }
 

test/integration/http-test.js

@@ -368,6 +368,18 @@ describe('HTTP APIs', function () {
   })
 
   describe('HEAD API', function () {
+    it('should have set content-type for turtle files',
+      function (done) {
+        server.head('/sampleContainer/example1.ttl')
+          .expect('Content-Type', 'text/turtle; charset=utf-8')
+          .end(done)
+      })
+    it('should have set content-type for image files',
+      function (done) {
+        server.head('/sampleContainer/solid.png')
+          .expect('Content-Type', 'image/png; charset=utf-8')
+          .end(done)
+      })
     it('should have Access-Control-Allow-Origin as Origin', function (done) {
       server.head('/sampleContainer/example1.ttl')
         .set('Origin', 'http://example.com')