Merge pull request #44244 from bubba/remove-streaming-from-activestor…

…age-redirect-controllers

Don't stream redirect controller responses

activestorage/CHANGELOG.md

@@ -1,3 +1,11 @@
+*   Don't stream responses in redirect mode
 
+    Previously, both redirect mode and proxy mode streamed their
+	responses which caused a new thread to be created, and could end
+	up leaking connections in the connection pool. But since redirect
+	mode doesn't actually send any data, it doesn't need to be
+	streamed.
+
+	*Luke Lau*
 
 Please check [7-0-stable](https://github.com/rails/rails/blob/7-0-stable/activestorage/CHANGELOG.md) for previous changes.

activestorage/app/controllers/active_storage/base_controller.rb

@@ -2,7 +2,7 @@
 
 # The base class for all Active Storage controllers.
 class ActiveStorage::BaseController < ActionController::Base
-  include ActiveStorage::SetCurrent, ActiveStorage::Streaming
+  include ActiveStorage::SetCurrent
 
   protect_from_forgery with: :exception
 

activestorage/app/controllers/active_storage/blobs/proxy_controller.rb

@@ -8,6 +8,7 @@
 # {Authenticated Controllers}[https://guides.rubyonrails.org/active_storage_overview.html#authenticated-controllers].
 class ActiveStorage::Blobs::ProxyController < ActiveStorage::BaseController
   include ActiveStorage::SetBlob
+  include ActiveStorage::Streaming
 
   def show
     if request.headers["Range"].present?

activestorage/app/controllers/active_storage/representations/proxy_controller.rb

@@ -7,6 +7,8 @@
 # require a higher level of protection consider implementing
 # {Authenticated Controllers}[https://guides.rubyonrails.org/active_storage_overview.html#authenticated-controllers].
 class ActiveStorage::Representations::ProxyController < ActiveStorage::Representations::BaseController
+  include ActiveStorage::Streaming
+
   def show
     http_cache_forever public: true do
       send_blob_stream @representation.image, disposition: params[:disposition]