diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-07-13 11:55:09 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-07-13 11:55:09 +0000 |
| commit | 9497d14f09dc76535dda47fc4257c51ef07a3f56 (patch) | |
| tree | 6bbe37740764bde615e18e36f5e36d5e19f49966 /lib/pleroma/reverse_proxy | |
| parent | 02cdedbf9fdf27d8dca78caf75f6413cd2566e3e (diff) | |
| parent | 29ffe81c2e2235ed723516e74a50b025af688b9b (diff) | |
| download | pleroma-9497d14f09dc76535dda47fc4257c51ef07a3f56.tar.gz | |
Merge branch 'fix/hackney-global-options' into 'develop'
Merge the default options with custom ones in ReverseProxy and Pleroma.HTTP and workaround for remote server certificate chain issues
See merge request pleroma/pleroma!1409
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() |