Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-05-18 00:17:23 +00:00
parent 2636a23092 919eef3098
commit 4c0770d6c8
3 changed files with 7 additions and 6 deletions
--- 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