diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-29 16:28:53 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-29 16:28:53 +0000 |
| commit | ce6dfb6f066616553d8594fd6ffadcc96ad1daff (patch) | |
| tree | b7b4022f45fd01233bf76138d5222b81f16e8ad4 /lib/pleroma/reverse_proxy.ex | |
| parent | 5cb37412a21420509f61027fe486ae66242f800a (diff) | |
| parent | d9aacbec4d8e787ff9f62427a120d28366463a7f (diff) | |
| download | pleroma-1.0.2.tar.gz | |
Merge branch 'release/1.0.2' into 'master'v1.0.2
1.0.2 release
See merge request pleroma/pleroma!1499
Diffstat (limited to 'lib/pleroma/reverse_proxy.ex')
| -rw-r--r-- | lib/pleroma/reverse_proxy.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/reverse_proxy.ex b/lib/pleroma/reverse_proxy.ex index de0f6e1bc..7e537743b 100644 --- a/lib/pleroma/reverse_proxy.ex +++ b/lib/pleroma/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() |