account for changes to lookup/getType returning null #105

Author: jenweber

lib/s3.js

@@ -120,11 +120,11 @@ module.exports = CoreObject.extend({
     var expires                   = options.expires;
     var serverSideEncryption      = options.serverSideEncryption;
 
-    mime.default_type = options.defaultMimeType || mime.getType('bin');
+    var defaultType = options.defaultMimeType || mime.getType('bin');
 
     var basePath    = path.join(cwd, filePath);
     var data        = fs.readFileSync(basePath);
-    var contentType = mime.getType(basePath);
+    var contentType = mime.getType(basePath) || defaultType;
     var encoding    = this._mimeCharsetsLookup(contentType);
     var key         = prefix === '' ? filePath : [prefix, filePath].join('/');
     var isGzipped   = gzippedFilePaths.indexOf(filePath) !== -1;
@@ -133,14 +133,14 @@ module.exports = CoreObject.extend({
     if (isGzipped && path.extname(basePath) === '.gz') {
       var basePathUngzipped = path.basename(basePath, '.gz');
       if (filePaths && filePaths.indexOf(basePathUngzipped) !== -1) {
-        contentType = mime.getType(basePathUngzipped);
+        contentType = mime.getType(basePathUngzipped) || defaultType;
         encoding = this._mimeCharsetsLookup(contentType);
       }
     }
     if (isBrotliCompressed) {
       var basePathUncompressed = path.basename(basePath, '.br');
       if (filePaths && filePaths.indexOf(basePathUncompressed) !== -1) {
-        contentType = mime.getType(basePathUncompressed);
+        contentType = mime.getType(basePathUncompressed) || defaultType;
         encoding = this._mimeCharsetsLookup(contentType);
       }
     }