From b07ce56a383e0ab1514e149b7c9ad2177ea59514 Mon Sep 17 00:00:00 2001 From: Peter Wagenet Date: Tue, 9 Jul 2019 12:54:35 -0700 Subject: Fix host for ActiveStorage DiskService Previous behavior would only set host, which didn't work correctly if the default_url_options contained the protocol or the port. --- activestorage/lib/active_storage/service/disk_service.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'activestorage/lib') diff --git a/activestorage/lib/active_storage/service/disk_service.rb b/activestorage/lib/active_storage/service/disk_service.rb index 67892d43b2..764a447c69 100644 --- a/activestorage/lib/active_storage/service/disk_service.rb +++ b/activestorage/lib/active_storage/service/disk_service.rb @@ -84,8 +84,12 @@ module ActiveStorage purpose: :blob_key } ) + current_uri = URI.parse(current_host) + generated_url = url_helpers.rails_disk_service_url(verified_key_with_expiration, - host: current_host, + protocol: current_uri.scheme, + host: current_uri.host, + port: current_uri.port, disposition: content_disposition, content_type: content_type, filename: filename -- cgit v1.2.3