diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-07-14 00:39:06 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-07-14 00:39:06 +0300 |
| commit | 418ae6638d64c915ce4dae742dd493f43c8025d8 (patch) | |
| tree | 88dab25ac8f569c2a7c12300be79f6cbd8357afe /lib/pleroma/reverse_proxy | |
| parent | a9459ff98f0af590931ef279c2bc7efb0cceac5a (diff) | |
| parent | 592411e4fe8a1cf39064e3dd5f9312ed5cdcd22e (diff) | |
| download | pleroma-418ae6638d64c915ce4dae742dd493f43c8025d8.tar.gz | |
Merge branch 'develop' into feature/admin-api-user-statuses
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() |