Browse Source

Respect proxy settings federation

tags/v1.1.4
jeff kaniini 5 years ago
parent
commit
9f3bcf0efe
1 changed files with 2 additions and 0 deletions
  1. +2
    -0
      lib/pleroma/http/connection.ex

+ 2
- 0
lib/pleroma/http/connection.ex View File

@@ -32,9 +32,11 @@ defmodule Pleroma.HTTP.Connection do
defp hackney_options(opts) do
options = Keyword.get(opts, :adapter, [])
adapter_options = Pleroma.Config.get([:http, :adapter], [])
proxy_url = Pleroma.Config.get([:http, :proxy_url], nil)

@hackney_options
|> Keyword.merge(adapter_options)
|> Keyword.merge(options)
|> Keyword.merge(proxy: proxy_url)
end
end

Loading…
Cancel
Save