aboutsummaryrefslogtreecommitdiffstats
path: root/activestorage/lib/active_storage
diff options
context:
space:
mode:
authorGeorge Claghorn <george.claghorn@gmail.com>2018-04-23 15:08:26 -0500
committerGitHub <noreply@github.com>2018-04-23 15:08:26 -0500
commite970d15211a8efd7349ff0e90d44d887b85793c2 (patch)
treed4c4223ba7b6ad489021c9e67f6d1e532ad0fda6 /activestorage/lib/active_storage
parent80cbf19453bb3fe22e8d038a9631b8436320788b (diff)
parent19770d6ca3ab72f760da47b5be484f36ae003f01 (diff)
downloadrails-e970d15211a8efd7349ff0e90d44d887b85793c2.tar.gz
rails-e970d15211a8efd7349ff0e90d44d887b85793c2.tar.bz2
rails-e970d15211a8efd7349ff0e90d44d887b85793c2.zip
Merge pull request #32703 from janko-m/halve-memory-allocation-in-s3-download
Halve memory allocation in S3Service#download
Diffstat (limited to 'activestorage/lib/active_storage')
-rw-r--r--activestorage/lib/active_storage/service/s3_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activestorage/lib/active_storage/service/s3_service.rb b/activestorage/lib/active_storage/service/s3_service.rb
index 5e489f4be1..0286e7ff21 100644
--- a/activestorage/lib/active_storage/service/s3_service.rb
+++ b/activestorage/lib/active_storage/service/s3_service.rb
@@ -33,7 +33,7 @@ module ActiveStorage
end
else
instrument :download, key: key do
- object_for(key).get.body.read.force_encoding(Encoding::BINARY)
+ object_for(key).get.body.string.force_encoding(Encoding::BINARY)
end
end
end