Merge branch 'master' of https://github.com/jackycute/HackMD

1 files changed, 6 insertions, 0 deletions

diff --git a/app.js b/app.js
index 677d3fa5..dbbecc98 100644
--- a/app.js
+++ b/app.js
@@ -22,6 +22,9 @@ var i18n = require('i18n')
 var flash = require('connect-flash')
 var validator = require('validator')
 
+// utils
+var getImageMimeType = require('./lib/utils.js').getImageMimeType
+
 // core
 var config = require('./lib/config.js')
 var logger = require('./lib/logger.js')
@@ -548,6 +551,9 @@ app.post('/uploadimage', function (req, res) {
                 Body: buffer
               }
 
+              var mimeType = getImageMimeType(files.image.path)
+              if (mimeType) { params.ContentType = mimeType }
+
               s3.putObject(params, function (err, data) {
                 if (err) {
                   logger.error(err)