diff options
| author | Rafael França <rafael@franca.dev> | 2019-07-23 10:37:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-23 10:37:47 -0400 |
| commit | fc175375e13d50213e796700c48ec0ab0b60b2fc (patch) | |
| tree | e9988faa2b57beb3dc8f9fbe37efd19777ba9b15 /activestorage/lib | |
| parent | 31105c81cc82ae829c382a4eee2c5aa362882dea (diff) | |
| parent | b07ce56a383e0ab1514e149b7c9ad2177ea59514 (diff) | |
| download | rails-fc175375e13d50213e796700c48ec0ab0b60b2fc.tar.gz rails-fc175375e13d50213e796700c48ec0ab0b60b2fc.tar.bz2 rails-fc175375e13d50213e796700c48ec0ab0b60b2fc.zip | |
Merge pull request #36642 from wagenet/fix-disk-service-host
Fix host for ActiveStorage DiskService
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 |