bss
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove follow_redirect options

This commit is contained in:
Hakaba Hitoyo 2018-12-06 11:38:33 +09:00
parent 27792b2d77
commit 96ba95df2e
6 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/http/connection.ex
View File

@ -6,7 +6,8 @@ defmodule Pleroma.HTTP.Connection do
@hackney_options [ @hackney_options [
pool: :default, pool: :default,
timeout: 10000, timeout: 10000,
recv_timeout: 20000 recv_timeout: 20000,
follow_redirect: true
] ]
@adapter Application.get_env(:tesla, :adapter) @adapter Application.get_env(:tesla, :adapter)

2
lib/pleroma/reverse_proxy.ex
View File

@ -56,7 +56,7 @@ defmodule Pleroma.ReverseProxy do
@hackney Application.get_env(:pleroma, :hackney, :hackney) @hackney Application.get_env(:pleroma, :hackney, :hackney)
@httpoison Application.get_env(:pleroma, :httpoison, HTTPoison) @httpoison Application.get_env(:pleroma, :httpoison, HTTPoison)
@default_hackney_options [{:follow_redirect, true}] @default_hackney_options []
@inline_content_types [ @inline_content_types [
"image/gif", "image/gif",

3
lib/pleroma/web/activity_pub/activity_pub.ex
View File

@ -765,8 +765,7 @@ def fetch_and_contain_remote_object_from_id(id) do
{:ok, %{body: body, status: code}} when code in 200..299 <- {:ok, %{body: body, status: code}} when code in 200..299 <-
@httpoison.get( @httpoison.get(
id, id,
[Accept: "application/activity+json"], Accept: "application/activity+json"
follow_redirect: true
), ),
{:ok, data} <- Jason.decode(body), {:ok, data} <- Jason.decode(body),
:ok <- Transmogrifier.contain_origin_from_id(id, data) do :ok <- Transmogrifier.contain_origin_from_id(id, data) do

1
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View File

@ -1185,7 +1185,6 @@ def suggestions(%{assigns: %{user: user}} = conn, _) do
@httpoison.get( @httpoison.get(
url, url,
[], [],
follow_redirect: true,
adapter: [ adapter: [
timeout: timeout, timeout: timeout,
recv_timeout: timeout recv_timeout: timeout

5
lib/pleroma/web/ostatus/ostatus.ex
View File

@ -349,8 +349,7 @@ def fetch_activity_from_atom_url(url) do
{:ok, %{body: body, status: code}} when code in 200..299 <- {:ok, %{body: body, status: code}} when code in 200..299 <-
@httpoison.get( @httpoison.get(
url, url,
[Accept: "application/atom+xml"], Accept: "application/atom+xml"
follow_redirect: true
) do ) do
Logger.debug("Got document from #{url}, handling...") Logger.debug("Got document from #{url}, handling...")
handle_incoming(body) handle_incoming(body)
@ -365,7 +364,7 @@ def fetch_activity_from_html_url(url) do
Logger.debug("Trying to fetch #{url}") Logger.debug("Trying to fetch #{url}")
with true <- String.starts_with?(url, "http"), with true <- String.starts_with?(url, "http"),
{:ok, %{body: body}} <- @httpoison.get(url, [], follow_redirect: true), {:ok, %{body: body}} <- @httpoison.get(url, []),
{:ok, atom_url} <- get_atom_url(body) do {:ok, atom_url} <- get_atom_url(body) do
fetch_activity_from_atom_url(atom_url) fetch_activity_from_atom_url(atom_url)
else else

2
lib/pleroma/web/web_finger/web_finger.ex
View File

@ -221,7 +221,7 @@ def get_template_from_xml(body) do
def find_lrdd_template(domain) do def find_lrdd_template(domain) do
with {:ok, %{status: status, body: body}} when status in 200..299 <- with {:ok, %{status: status, body: body}} when status in 200..299 <-
@httpoison.get("http://#{domain}/.well-known/host-meta", [], follow_redirect: true) do @httpoison.get("http://#{domain}/.well-known/host-meta", []) do
get_template_from_xml(body) get_template_from_xml(body)
else else
_ -> _ ->