summary refs log tree commit
diff options
context:
space:
mode:
authorMichael Fellinger <m.fellinger@gmail.com>2011-11-19 11:24:44 -0800
committerMichael Fellinger <m.fellinger@gmail.com>2011-11-19 11:24:44 -0800
commit333c5bdb31e8770b34508fe4556e82ea41d5972c (patch)
tree892f591ab45fb7d59afc74a769c2d43626a34540
parentfccbe7ce4bb9409fdbb16e2e56828d9096695266 (diff)
parent0772399b12dcccb0c07535fa85d9c6dbab823739 (diff)
downloadrack-333c5bdb31e8770b34508fe4556e82ea41d5972c.tar.gz
Merge pull request #270 from mtfuji/rack-1.2
Rack 1.2
-rw-r--r--lib/rack/mime.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/rack/mime.rb b/lib/rack/mime.rb
index 2cf03751..7fceb18e 100644
--- a/lib/rack/mime.rb
+++ b/lib/rack/mime.rb
@@ -70,6 +70,7 @@ module Rack
       ".dll"     => "application/x-msdownload",
       ".dmg"     => "application/octet-stream",
       ".doc"     => "application/msword",
+      ".docx"    => "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
       ".dot"     => "application/msword",
       ".dtd"     => "application/xml-dtd",
       ".dvi"     => "application/x-dvi",
@@ -196,6 +197,7 @@ module Rack
       ".xbm"     => "image/x-xbitmap",
       ".xhtml"   => "application/xhtml+xml",
       ".xls"     => "application/vnd.ms-excel",
+      ".xlsx"    => "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
       ".xml"     => "application/xml",
       ".xpm"     => "image/x-xpixmap",
       ".xsl"     => "application/xml",