diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-07-15 14:11:54 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-07-15 14:11:54 +0700 |
| commit | 64a946643e6f9159a8029be8ec9e0b71b04906f3 (patch) | |
| tree | bf44cb695880f368aa2976fe134e83baea60927a /lib/pleroma/reverse_proxy | |
| parent | a87c313309b73ced5970c59d00117c357f51fecb (diff) | |
| parent | 46ef8f021635c630bcd6973e6fbb7c58bcafb6bf (diff) | |
| download | pleroma-64a946643e6f9159a8029be8ec9e0b71b04906f3.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
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() |