Ensure the proper content type is returned for static files.

1 files changed, 3 insertions, 3 deletions

diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb
index cf13938331..913b899e20 100644
--- a/actionpack/lib/action_dispatch/middleware/static.rb
+++ b/actionpack/lib/action_dispatch/middleware/static.rb
@@ -6,13 +6,13 @@ module ActionDispatch
       @at, @root = at.chomp('/'), root.chomp('/')
       @compiled_at = (Regexp.compile(/^#{Regexp.escape(at)}/) unless @at.blank?)
       @compiled_root = Regexp.compile(/^#{Regexp.escape(root)}/)
-      @file_server = ::Rack::File.new(root)
+      @file_server = ::Rack::File.new(@root)
     end
 
     def match?(path)
       path = path.dup
-      if @compiled_at.blank? || path.sub!(@compiled_at, '')
-        full_path = File.join(@root, ::Rack::Utils.unescape(path))
+      if !@compiled_at || path.sub!(@compiled_at, '')
+        full_path = path.empty? ? @root : File.join(@root, ::Rack::Utils.unescape(path))
         paths = "#{full_path}#{ext}"
 
         matches = Dir[paths]