diff options
| author | Spencer Alves <impiaaa@gmail.com> | 2018-05-31 21:33:16 -0700 |
|---|---|---|
| committer | Spencer Alves <impiaaa@gmail.com> | 2018-05-31 21:33:16 -0700 |
| commit | 7d2e6429c27c5ddc8ef3d2366c44329092e07f77 (patch) | |
| tree | 7cfd2035f69616a369b2f3762ce9cefe61c2bd22 /config/initializers/http_client_proxy.rb | |
| parent | f2ff167c1a8df9b2521d33fcca15b8d5c67c50b1 (diff) | |
| parent | e396fbfe3bf4d2a404e78e73cff1a609dd0a9bfb (diff) | |
Merge branch 'glitch' into thread-icon
Diffstat (limited to 'config/initializers/http_client_proxy.rb')
| -rw-r--r-- | config/initializers/http_client_proxy.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/http_client_proxy.rb b/config/initializers/http_client_proxy.rb index f5026d59e..52c595c5d 100644 --- a/config/initializers/http_client_proxy.rb +++ b/config/initializers/http_client_proxy.rb @@ -18,7 +18,8 @@ module Goldfinger def self.finger(uri, opts = {}) to_hidden = /\.(onion|i2p)(:\d+)?$/.match(uri) raise Mastodon::HostValidationError, 'Instance does not support hidden service connections' if !Rails.configuration.x.access_to_hidden_service && to_hidden - opts = opts.merge(Rails.configuration.x.http_client_proxy).merge(ssl: !to_hidden) + opts = { ssl: !to_hidden, headers: {} }.merge(Rails.configuration.x.http_client_proxy).merge(opts) + opts[:headers]['User-Agent'] ||= Mastodon::Version.user_agent Goldfinger::Client.new(uri, opts).finger end end |