Commit 9b396706 authored by kaniini's avatar kaniini
Browse files

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

http: fix mediaproxy FD leaks

See merge request pleroma/pleroma!395
parents ae7c79cf c302c619
Pipeline #4132 passed with stages
in 5 minutes and 53 seconds
......@@ -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]]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment