From 207fa5c11ddf1cfd696f0eeb07d6466aae9d451e Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Mon, 15 Jul 2013 01:19:36 -0300 Subject: Revert "Don't use Rack::Sendfile middleware if x_sendfile_header is not present" This reverts commit 19ac034bdc9be175eff7cf54208ba14b43d97681. And allows webservers to configure X-Sendfile-Type. Closes #11440 thanks to [@MSch] Conflicts: railties/lib/rails/application.rb --- railties/lib/rails/application/default_middleware_stack.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/railties/lib/rails/application/default_middleware_stack.rb b/railties/lib/rails/application/default_middleware_stack.rb index 370c906086..570ff02c83 100644 --- a/railties/lib/rails/application/default_middleware_stack.rb +++ b/railties/lib/rails/application/default_middleware_stack.rb @@ -20,9 +20,7 @@ module Rails middleware.use ::ActionDispatch::SSL, config.ssl_options end - if config.action_dispatch.x_sendfile_header.present? - middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header - end + middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header if config.serve_static_assets middleware.use ::ActionDispatch::Static, paths["public"].first, config.static_cache_control -- cgit v1.2.3