diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-08 04:29:24 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-08 10:51:47 -0200 |
| commit | 54faddf2a8342466ad1c685ceac46509ae1f110f (patch) | |
| tree | 0b66e51da62dff286b90c1c6393c1bd73e930a3b /actionpack/lib | |
| parent | d39d878d2b250636256ecf54473d365ffb62eb6d (diff) | |
| download | rails-54faddf2a8342466ad1c685ceac46509ae1f110f.tar.gz rails-54faddf2a8342466ad1c685ceac46509ae1f110f.tar.bz2 rails-54faddf2a8342466ad1c685ceac46509ae1f110f.zip | |
Merge pull request #8812 from rubys/master
Eliminate Rack::File headers deprecation warning
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/static.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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) |