aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2017-11-29 02:29:33 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2017-11-29 02:31:37 -0500
commit0061e0cd28438f4f3f334c5a75eb292e5f110262 (patch)
treef86858abee90c94e1ab45e69813c2ac2741083f3 /actionpack/lib
parentf128177eb701373326a3ae91651bf291d0fd245c (diff)
downloadrails-0061e0cd28438f4f3f334c5a75eb292e5f110262.tar.gz
rails-0061e0cd28438f4f3f334c5a75eb292e5f110262.tar.bz2
rails-0061e0cd28438f4f3f334c5a75eb292e5f110262.zip
Restore mpeg mime type, delete less common mime types
See discussion in #31251
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/http/mime_types.rb13
1 files changed, 4 insertions, 9 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_types.rb b/actionpack/lib/action_dispatch/http/mime_types.rb
index cc41bdda5a..6d703cb6b1 100644
--- a/actionpack/lib/action_dispatch/http/mime_types.rb
+++ b/actionpack/lib/action_dispatch/http/mime_types.rb
@@ -18,20 +18,15 @@ Mime::Type.register "image/gif", :gif, [], %w(gif)
Mime::Type.register "image/bmp", :bmp, [], %w(bmp)
Mime::Type.register "image/tiff", :tiff, [], %w(tif tiff)
Mime::Type.register "image/svg+xml", :svg
-Mime::Type.register "image/webp", :webp, [], %w(webp)
-Mime::Type.register "audio/mpeg", :mpg, [], %w(mp1 mp2 mp3)
-Mime::Type.register "audio/webm", :weba, [], %w(weba)
+Mime::Type.register "video/mpeg", :mpeg, [], %w(mpg mpeg mpe)
+
+Mime::Type.register "audio/mpeg", :mp3, [], %w(mp1 mp2 mp3)
Mime::Type.register "audio/ogg", :ogg, [], %w(oga ogg spx opus)
-Mime::Type.register "audio/aac", :acc, [], %w(aac)
-Mime::Type.register "audio/mp4", :m4a, [], %w(m4a mpg4)
-Mime::Type.register "audio/flac", :flac, [], %w(flac)
+Mime::Type.register "audio/aac", :m4a, %( audio/mp4 ), %w(m4a mpg4 aac)
Mime::Type.register "video/webm", :webm, [], %w(webm)
Mime::Type.register "video/mp4", :mp4, [], %w(mp4 m4v)
-Mime::Type.register "video/ogg", :ogv, [], %w(ogv)
-
-Mime::Type.register "application/ogx", :ogx, [], %w(ogx)
Mime::Type.register "font/otf", :otf, [], %w(otf)
Mime::Type.register "font/ttf", :ttf, [], %w(ttf)