diff options
| author | Peter Wagenet <peter.wagenet@gmail.com> | 2019-07-09 12:54:35 -0700 |
|---|---|---|
| committer | Peter Wagenet <peter.wagenet@gmail.com> | 2019-07-09 12:54:35 -0700 |
| commit | b07ce56a383e0ab1514e149b7c9ad2177ea59514 (patch) | |
| tree | e37750c0af986f62f0d9d6da41ff1b18b66e7279 /activestorage/lib | |
| parent | 6e40b131d2c7208e116d267e4b40dcf621f8b442 (diff) | |
| download | rails-b07ce56a383e0ab1514e149b7c9ad2177ea59514.tar.gz rails-b07ce56a383e0ab1514e149b7c9ad2177ea59514.tar.bz2 rails-b07ce56a383e0ab1514e149b7c9ad2177ea59514.zip | |
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.
Diffstat (limited to 'activestorage/lib')
| -rw-r--r-- | activestorage/lib/active_storage/service/disk_service.rb | 6 |
1 files changed, 5 insertions, 1 deletions
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 |