diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-07-14 21:43:30 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-07-14 21:43:30 +0300 |
| commit | c729883936c7d258cb670929af9577aec3e22851 (patch) | |
| tree | 17aec90897b221c000be1992001967a3861a6c10 /lib/pleroma/reverse_proxy | |
| parent | 0384459ce552c50edb582413808a099086b6495e (diff) | |
| parent | 93701c3399add8af2d4a5d43b6f171d84655a533 (diff) | |
| download | pleroma-c729883936c7d258cb670929af9577aec3e22851.tar.gz | |
Merge branch 'develop' into feature/digest-email
Diffstat (limited to 'lib/pleroma/reverse_proxy')
| -rw-r--r-- | lib/pleroma/reverse_proxy/reverse_proxy.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/reverse_proxy/reverse_proxy.ex b/lib/pleroma/reverse_proxy/reverse_proxy.ex index bf31e9cba..1f98f215c 100644 --- a/lib/pleroma/reverse_proxy/reverse_proxy.ex +++ b/lib/pleroma/reverse_proxy/reverse_proxy.ex @@ -61,7 +61,7 @@ defmodule Pleroma.ReverseProxy do * `http`: options for [hackney](https://github.com/benoitc/hackney). """ - @default_hackney_options [] + @default_hackney_options [pool: :media] @inline_content_types [ "image/gif", @@ -94,7 +94,8 @@ defmodule Pleroma.ReverseProxy do def call(conn = %{method: method}, url, opts) when method in @methods do hackney_opts = - @default_hackney_options + Pleroma.HTTP.Connection.hackney_options([]) + |> Keyword.merge(@default_hackney_options) |> Keyword.merge(Keyword.get(opts, :http, [])) |> HTTP.process_request_options() |