moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent ae7c79cfc2 c302c619b9
commit 9b39670683
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/http/http.ex
View File

@ -19,7 +19,7 @@ defp process_sni_options(options, url) 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]]