Merge branch 'bugfix/http-fd-exhaustion-mediaproxy' into 'develop'

http: fix mediaproxy FD leaks

See merge request pleroma/pleroma!395
This commit is contained in:
kaniini 2018-10-26 06:39:23 +00:00
commit 9b39670683

View File

@ -19,7 +19,7 @@ defp process_sni_options(options, url) do
end
end
defp process_request_options(options) do
def process_request_options(options) do
config = Application.get_env(:pleroma, :http, [])
proxy = Keyword.get(config, :proxy_url, nil)
options = options ++ [hackney: [pool: :default]]