diff options
| author | Jeremy Daer <jeremydaer@gmail.com> | 2015-10-13 11:16:50 -0700 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2015-10-13 11:16:50 -0700 |
| commit | 9d05430c956c4ae1d0aefda02def5052ea818433 (patch) | |
| tree | ce122ef6f33520e5e00e808927490464cc0f6f87 /railties/lib/rails/application/default_middleware_stack.rb | |
| parent | 8e7a3b056328c55e0c2a9cb51e46db443ebe8569 (diff) | |
| parent | 52260581638406d910e09e8d2e66b51acb76c5c6 (diff) | |
| download | rails-9d05430c956c4ae1d0aefda02def5052ea818433.tar.gz rails-9d05430c956c4ae1d0aefda02def5052ea818433.tar.bz2 rails-9d05430c956c4ae1d0aefda02def5052ea818433.zip | |
Merge pull request #19135 from yuki24/access-control-support
Add basic support for access control headers to ActionDispatch::Static
Diffstat (limited to 'railties/lib/rails/application/default_middleware_stack.rb')
| -rw-r--r-- | railties/lib/rails/application/default_middleware_stack.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/railties/lib/rails/application/default_middleware_stack.rb b/railties/lib/rails/application/default_middleware_stack.rb index 21062f3a53..387d92db73 100644 --- a/railties/lib/rails/application/default_middleware_stack.rb +++ b/railties/lib/rails/application/default_middleware_stack.rb @@ -18,7 +18,10 @@ module Rails middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header if config.serve_static_files - middleware.use ::ActionDispatch::Static, paths["public"].first, config.static_cache_control, index: config.static_index + headers = config.public_file_server.headers || {} + headers['Cache-Control'.freeze] = config.static_cache_control if config.static_cache_control + + middleware.use ::ActionDispatch::Static, paths["public"].first, index: config.static_index, headers: headers end if rack_cache = load_rack_cache |