Skip to content

Commit

Permalink
Replace mime. Closes #1832
Browse files Browse the repository at this point in the history
  • Loading branch information
Eran Hammer committed Aug 5, 2014
1 parent ac04e51 commit e467162
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions lib/file.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
var Fs = require('fs');
var Path = require('path');
var Crypto = require('crypto');
var Mime = require('mime');
var MimeTypes = require('mime-types');
var Boom = require('boom');
var Hoek = require('hoek');
var Response = require('./response');
Expand Down Expand Up @@ -73,7 +73,7 @@ internals.Response.prototype._prepare = function (request, callback) {
}

self.bytes(stat.size);
self.type(Mime.lookup(path));
self.type(MimeTypes.lookup(path) || 'application/octet-stream');
self._header('last-modified', stat.mtime.toString());

if (request.server._etags) {
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "hapi",
"description": "HTTP Server framework",
"homepage": "http://hapijs.com",
"version": "6.4.0",
"version": "6.5.0",
"repository": {
"type": "git",
"url": "git://github.com/hapijs/hapi"
Expand All @@ -29,14 +29,14 @@
"iron": "2.x.x",
"topo": "1.x.x",
"kilt": "^1.1.x",
"qs": "1.x.x",
"async": "0.9.x",
"multiparty": "3.2.x",
"mime": "1.2.x",
"mime-types": "1.0.x",
"lru-cache": "2.5.x",
"optimist": "0.6.x",
"negotiator": "0.4.x",
"semver": "2.3.x",
"qs": "1.x.x"
"semver": "2.3.x"
},
"devDependencies": {
"lab": "3.x.x",
Expand Down

0 comments on commit e467162

Please sign in to comment.