From 54faddf2a8342466ad1c685ceac46509ae1f110f Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Tue, 8 Jan 2013 04:29:24 -0800 Subject: Merge pull request #8812 from rubys/master Eliminate Rack::File headers deprecation warning --- actionpack/lib/action_dispatch/middleware/static.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb index ad11b6a211..6e81073e1e 100644 --- a/actionpack/lib/action_dispatch/middleware/static.rb +++ b/actionpack/lib/action_dispatch/middleware/static.rb @@ -5,7 +5,7 @@ module ActionDispatch def initialize(root, cache_control) @root = root.chomp('/') @compiled_root = /^#{Regexp.escape(root)}/ - @file_server = ::Rack::File.new(@root, cache_control) + @file_server = ::Rack::File.new(@root, 'Cache-Control' => cache_control) end def match?(path) -- cgit v1.2.3