src/main/scala/s3/website/model/push.scala in s3_website-2.14.3 vs src/main/scala/s3/website/model/push.scala in s3_website-2.15.0

- old
+ new

@@ -72,10 +72,13 @@ } unzippedFile } else { originalFile } - val mimeType = tika.detect(file) + val mimeType = + site.config.content_type + .flatMap { _.globMatch(s3Key) } + .getOrElse { tika.detect(file) } if (mimeType.startsWith("text/") || mimeType == "application/json") mimeType + "; charset=utf-8" else mimeType }