aboutsummaryrefslogtreecommitdiffstats
path: root/activestorage/app/controllers
diff options
context:
space:
mode:
authorAnton Khamets <colorfulfool@gmail.com>2017-08-11 20:18:12 +0300
committerRafael França <rafaelmfranca@gmail.com>2017-08-11 13:18:12 -0400
commite25466b142c067ad44130d93fa864f5ffa9643bb (patch)
treeacd4a00126e8b831123db68ab208c1cc05b4e1f7 /activestorage/app/controllers
parentde80aa641290a03c023d00d2ffca368026335fe4 (diff)
downloadrails-e25466b142c067ad44130d93fa864f5ffa9643bb.tar.gz
rails-e25466b142c067ad44130d93fa864f5ffa9643bb.tar.bz2
rails-e25466b142c067ad44130d93fa864f5ffa9643bb.zip
Enable browser caching for blobs and variants (#30196)
Diffstat (limited to 'activestorage/app/controllers')
-rw-r--r--activestorage/app/controllers/active_storage/blobs_controller.rb1
-rw-r--r--activestorage/app/controllers/active_storage/variants_controller.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/activestorage/app/controllers/active_storage/blobs_controller.rb b/activestorage/app/controllers/active_storage/blobs_controller.rb
index 05af29f8b2..cff88bd488 100644
--- a/activestorage/app/controllers/active_storage/blobs_controller.rb
+++ b/activestorage/app/controllers/active_storage/blobs_controller.rb
@@ -5,6 +5,7 @@
class ActiveStorage::BlobsController < ActionController::Base
def show
if blob = find_signed_blob
+ expires_in 5.minutes # service_url defaults to 5 minutes
redirect_to blob.service_url(disposition: disposition_param)
else
head :not_found
diff --git a/activestorage/app/controllers/active_storage/variants_controller.rb b/activestorage/app/controllers/active_storage/variants_controller.rb
index 994c57aafd..b72b0ff7f5 100644
--- a/activestorage/app/controllers/active_storage/variants_controller.rb
+++ b/activestorage/app/controllers/active_storage/variants_controller.rb
@@ -5,6 +5,7 @@
class ActiveStorage::VariantsController < ActionController::Base
def show
if blob = find_signed_blob
+ expires_in 5.minutes # service_url defaults to 5 minutes
redirect_to ActiveStorage::Variant.new(blob, decoded_variation).processed.service_url(disposition: disposition_param)
else
head :not_found