projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bugfix/http-fd-exhaustion-mediaproxy' into 'develop'
[akkoma]
/
lib
/
pleroma
/
http
/
http.ex
diff --git
a/lib/pleroma/http/http.ex
b/lib/pleroma/http/http.ex
index c19bccf607872d98886c1489924b7a421e897c40..e64266ae7e9fa9ce2a3a0f7fd467b445c7c47bee 100644
(file)
--- a/
lib/pleroma/http/http.ex
+++ b/
lib/pleroma/http/http.ex
@@
-22,6
+22,7
@@
defmodule Pleroma.HTTP 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]]
case proxy do
nil -> options