diff options
Diffstat (limited to 'patches/4(fix_searches_p3).patch')
| -rw-r--r-- | patches/4(fix_searches_p3).patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/patches/4(fix_searches_p3).patch b/patches/4(fix_searches_p3).patch new file mode 100644 index 0000000..0a2af01 --- /dev/null +++ b/patches/4(fix_searches_p3).patch @@ -0,0 +1,43 @@ +From 8e8b3be31345ce18150b38ebbe84a3fc23f13e0e Mon Sep 17 00:00:00 2001 +From: Mint <> +Date: Wed, 31 May 2023 20:17:33 +0300 +Subject: [PATCH] Use Tesla's middleware for redirect handling on Hackney + +--- + lib/pleroma/http.ex | 6 +++++- + lib/pleroma/http/adapter_helper/hackney.ex | 2 -- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/lib/pleroma/http.ex b/lib/pleroma/http.ex +index a0e7d80f83..6c430fc2d0 100644 +--- a/lib/pleroma/http.ex ++++ b/lib/pleroma/http.ex +@@ -107,7 +107,11 @@ defp adapter_middlewares(Tesla.Adapter.Gun) do + end + + defp adapter_middlewares(Tesla.Adapter.Hackney) do +- [Tesla.Middleware.FollowRedirects] ++ if Pleroma.Config.get([:http, :adapter, :follow_redirect]) != false do ++ [Tesla.Middleware.FollowRedirects] ++ else ++ [] ++ end + end + + defp adapter_middlewares(_) do +diff --git a/lib/pleroma/http/adapter_helper/hackney.ex b/lib/pleroma/http/adapter_helper/hackney.ex +index f3be1f3d0f..15a84cf736 100644 +--- a/lib/pleroma/http/adapter_helper/hackney.ex ++++ b/lib/pleroma/http/adapter_helper/hackney.ex +@@ -6,8 +6,6 @@ defmodule Pleroma.HTTP.AdapterHelper.Hackney do + @behaviour Pleroma.HTTP.AdapterHelper + + @defaults [ +- follow_redirect: true, +- force_redirect: true + ] + + @spec options(keyword(), URI.t()) :: keyword() +-- +GitLab + |