diff options
| author | ThibG <thib@sitedethib.com> | 2018-05-18 17:20:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-18 17:20:32 +0200 |
| commit | 625c4f36ef394215e65e19157bfaf60e7de94b5f (patch) | |
| tree | 72560d046b60c8478d10f26c212a70870e50eb2d /config/initializers/http_client_proxy.rb | |
| parent | 023dfa119ed43fe35188e560c24cd3091c14ad0b (diff) | |
| parent | 765fc6700cefcf326e8e4104f7f82ac5ed9b9bea (diff) | |
Merge pull request #490 from glitch-soc/merge-upstream
Merge with tootsuite @ 57b503d4ef0754e4651eae26b628cba60e1ab4e9
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 |