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:
commit
9b39670683
@ -19,7 +19,7 @@ defmodule Pleroma.HTTP do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
defp process_request_options(options) do
|
def process_request_options(options) do
|
||||||
config = Application.get_env(:pleroma, :http, [])
|
config = Application.get_env(:pleroma, :http, [])
|
||||||
proxy = Keyword.get(config, :proxy_url, nil)
|
proxy = Keyword.get(config, :proxy_url, nil)
|
||||||
options = options ++ [hackney: [pool: :default]]
|
options = options ++ [hackney: [pool: :default]]
|
||||||
|
Loading…
Reference in New Issue
Block a user