Merge pull request #12365 from jbaudanza/reorder

Move Rack::Cache after ActionDispatch::Static in the middleware stack

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

railties/test/application/middleware_test.rb

@@ -61,7 +61,7 @@ module ApplicationTests
 
       boot!
 
-      assert_equal "Rack::Cache", middleware.first
+      assert middleware.include?("Rack::Cache")
     end
 
     test "ActiveRecord::Migration::CheckPending is present when active_record.migration_error is set to :page_load" do