aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorAntonio Tapiador <atapiador@dit.upm.es>2012-01-29 17:36:10 +0100
committerAntonio Tapiador <atapiador@dit.upm.es>2012-01-29 17:36:10 +0100
commit5dd80db4ea8989fa69629cc682766e000ee83d49 (patch)
tree526777409c0d457f8a3bb627a0ccd535c28d8f96 /actionpack/lib/action_dispatch
parentec4440fd4e886bc491726070b9fc44938f8798ee (diff)
downloadrails-5dd80db4ea8989fa69629cc682766e000ee83d49.tar.gz
rails-5dd80db4ea8989fa69629cc682766e000ee83d49.tar.bz2
rails-5dd80db4ea8989fa69629cc682766e000ee83d49.zip
Add 'image/pjpeg' format used by IE
http://msdn.microsoft.com/en-us/library/ms775147%28v=vs.85%29.aspx#_replace
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/http/mime_types.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_types.rb b/actionpack/lib/action_dispatch/http/mime_types.rb
index 3da4f91051..a6b3aee5e7 100644
--- a/actionpack/lib/action_dispatch/http/mime_types.rb
+++ b/actionpack/lib/action_dispatch/http/mime_types.rb
@@ -9,7 +9,7 @@ Mime::Type.register "text/calendar", :ics
Mime::Type.register "text/csv", :csv
Mime::Type.register "image/png", :png, [], %w(png)
-Mime::Type.register "image/jpeg", :jpeg, [], %w(jpg jpeg jpe)
+Mime::Type.register "image/jpeg", :jpeg, [], %w(jpg jpeg jpe pjpeg)
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)