projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/mediaproxy-whitelist-base_url' into 'develop'
[akkoma]
/
lib
/
pleroma
/
reverse_proxy
/
reverse_proxy.ex
diff --git
a/lib/pleroma/reverse_proxy/reverse_proxy.ex
b/lib/pleroma/reverse_proxy/reverse_proxy.ex
index bf31e9cba26a1b2919732b75f3237fe444b9a622..1f98f215ca343d0e7e83d5e7f3eea974b5c3a022 100644
(file)
--- 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).
"""
* `http`: options for [hackney](https://github.com/benoitc/hackney).
"""
- @default_hackney_options []
+ @default_hackney_options [
pool: :media
]
@inline_content_types [
"image/gif",
@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 =
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()
|> Keyword.merge(Keyword.get(opts, :http, []))
|> HTTP.process_request_options()