Merge pull request #847 from mojombo/mime_file

Load in Apache MIME Types
2013-03-12 11:06:26 -07:00 · 2013-03-12 11:06:26 -07:00 · 2473bdbd7c
parent 4e794a73e0 524aa1f36a
commit 2473bdbd7c
2 changed files with 1590 additions and 3 deletions
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@ -9,9 +9,8 @@ module Jekyll

        FileUtils.mkdir_p(destination)

-        mime_types = WEBrick::HTTPUtils::DefaultMimeTypes
-        mime_types.store 'js', 'application/javascript'
-        mime_types.store 'svg', 'image/svg+xml'
+        mime_types_file = File.expand_path('../mime.types', File.dirname(__FILE__))
+        mime_types = WEBrick::HTTPUtils::load_mime_types(mime_types_file)

        s = HTTPServer.new(
          :Port => options['port'],
--- a/lib/jekyll/mime.types
+++ b/lib/jekyll/mime.types