diff options
| author | kaniini <nenolod@gmail.com> | 2018-10-26 06:39:23 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-10-26 06:39:23 +0000 |
| commit | 9b39670683af82e120689753e20c5fb39ed51ba0 (patch) | |
| tree | 829cde349c4758572b0b9c55b764b5d7b1fba0ee /lib | |
| parent | ae7c79cfc236f7192ea8425560cc31a60e689e9d (diff) | |
| parent | c302c619b957bab54fcc23a867d8949e42b102e5 (diff) | |
| download | pleroma-9b39670683af82e120689753e20c5fb39ed51ba0.tar.gz | |
Merge branch 'bugfix/http-fd-exhaustion-mediaproxy' into 'develop'
http: fix mediaproxy FD leaks
See merge request pleroma/pleroma!395
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/http/http.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex index f222e1774..e64266ae7 100644 --- a/lib/pleroma/http/http.ex +++ b/lib/pleroma/http/http.ex @@ -19,7 +19,7 @@ defmodule Pleroma.HTTP 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]] |