Merge pull request #47094 from zzak/rack-3-files-continued

Replace deprecated Rack::File with Rack::Files
rails · Jan 25, 2023 · e572f23 · e572f23
2 parents 0236339 + 12de399
commit e572f23
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb
@@ -24,7 +24,7 @@ def call(env)
     end
   end
 
-  # This endpoint serves static files from disk using +Rack::File+.
+  # This endpoint serves static files from disk using +Rack::Files+.
   #
   # URL paths are matched with static files according to expected
   # conventions: +path+, +path+.html, +path+/index.html.

diff --git a/activestorage/app/controllers/concerns/active_storage/file_server.rb b/activestorage/app/controllers/concerns/active_storage/file_server.rb
@@ -5,7 +5,7 @@
 module ActiveStorage::FileServer # :nodoc:
   private
     def serve_file(path, content_type:, disposition:)
-      Rack::File.new(nil).serving(request, path).tap do |(status, headers, body)|
+      ::Rack::Files.new(nil).serving(request, path).tap do |(status, headers, body)|
         self.status = status
         self.response_body = body