diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-07-25 18:54:25 -0300 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-08-13 16:22:15 -0700 |
| commit | 19ac034bdc9be175eff7cf54208ba14b43d97681 (patch) | |
| tree | f0f959422f72517add3b85d2a12ff8766517a44d /railties | |
| parent | b537595665527b8ca5ebad97fc053fd102e16d32 (diff) | |
| download | rails-19ac034bdc9be175eff7cf54208ba14b43d97681.tar.gz rails-19ac034bdc9be175eff7cf54208ba14b43d97681.tar.bz2 rails-19ac034bdc9be175eff7cf54208ba14b43d97681.zip | |
Don't use Rack::Sendfile middleware if x_sendfile_header is not present
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/application.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 9e2f1a4b7a..fb60ddd9b5 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -163,7 +163,9 @@ module Rails middleware.use ::Rails::Rack::Logger # must come after Rack::MethodOverride to properly log overridden methods middleware.use ::ActionDispatch::ShowExceptions, config.consider_all_requests_local middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies - middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header + if config.action_dispatch.x_sendfile_header.present? + middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header + end middleware.use ::ActionDispatch::Reloader unless config.cache_classes middleware.use ::ActionDispatch::Callbacks middleware.use ::ActionDispatch::Cookies |