aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorJonathan Baudanza <jon@jonb.org>2013-09-25 17:06:20 -0700
committerJonathan Baudanza <jon@jonb.org>2013-09-25 17:06:20 -0700
commit210d0c7b412760f3efeb0924100479106cfa4817 (patch)
tree76aa6414ec6469e5bbf1e25fd02906795c250ebe /railties/lib
parenta6e1a73ffd05211e09e93fc5df4e5ef9af718b11 (diff)
downloadrails-210d0c7b412760f3efeb0924100479106cfa4817.tar.gz
rails-210d0c7b412760f3efeb0924100479106cfa4817.tar.bz2
rails-210d0c7b412760f3efeb0924100479106cfa4817.zip
Move Rack::Cache after AD::Static in the stack
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/application/default_middleware_stack.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/railties/lib/rails/application/default_middleware_stack.rb b/railties/lib/rails/application/default_middleware_stack.rb
index 570ff02c83..a00afe008c 100644
--- a/railties/lib/rails/application/default_middleware_stack.rb
+++ b/railties/lib/rails/application/default_middleware_stack.rb
@@ -11,11 +11,6 @@ module Rails
def build_stack
ActionDispatch::MiddlewareStack.new.tap do |middleware|
- if rack_cache = load_rack_cache
- require "action_dispatch/http/rack_cache"
- middleware.use ::Rack::Cache, rack_cache
- end
-
if config.force_ssl
middleware.use ::ActionDispatch::SSL, config.ssl_options
end
@@ -26,6 +21,11 @@ module Rails
middleware.use ::ActionDispatch::Static, paths["public"].first, config.static_cache_control
end
+ if rack_cache = load_rack_cache
+ require "action_dispatch/http/rack_cache"
+ middleware.use ::Rack::Cache, rack_cache
+ end
+
middleware.use ::Rack::Lock unless allow_concurrency?
middleware.use ::Rack::Runtime
middleware.use ::Rack::MethodOverride