commit: 9b39670683af82e120689753e20c5fb39ed51ba0
parent ae7c79cfc236f7192ea8425560cc31a60e689e9d
Author: kaniini <nenolod@gmail.com>
Date: Fri, 26 Oct 2018 06:39:23 +0000
Merge branch 'bugfix/http-fd-exhaustion-mediaproxy' into 'develop'
http: fix mediaproxy FD leaks
See merge request pleroma/pleroma!395
Diffstat:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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]]