Browse Source

Merge branch 'fix/followredirects-hackney' into 'develop'

Don't enable Pleroma.HTTP.Middleware.FollowRedirects unless Gun is used

Closes #1966 and #1961

See merge request pleroma/pleroma!2778
chores/our-libs-hex-releases
feld 4 years ago
parent
commit
f0d13fc3f7
1 changed files with 8 additions and 1 deletions
  1. +8
    -1
      lib/pleroma/http/http.ex

+ 8
- 1
lib/pleroma/http/http.ex View File

@@ -69,7 +69,8 @@ defmodule Pleroma.HTTP do
request = build_request(method, headers, options, url, body, params)

adapter = Application.get_env(:tesla, :adapter)
client = Tesla.client([Pleroma.HTTP.Middleware.FollowRedirects], adapter)

client = Tesla.client(adapter_middlewares(adapter), adapter)

maybe_limit(
fn ->
@@ -107,4 +108,10 @@ defmodule Pleroma.HTTP do
defp maybe_limit(fun, _, _) do
fun.()
end

defp adapter_middlewares(Tesla.Adapter.Gun) do
[Pleroma.HTTP.Middleware.FollowRedirects]
end

defp adapter_middlewares(_), do: []
end

Loading…
Cancel
Save