Merge branch 'correct-and-improve-http-options' into 'develop'

Correct and improve http options See merge request pleroma/pleroma!505
2018-12-06 15:57:56 +00:00 · 2018-12-06 15:57:56 +00:00 · abead01ab6
commit abead01ab6
parent b0adea30b3 a09ed0f5af
8 changed files with 20 additions and 27 deletions
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@ -772,10 +772,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
         {:ok, %{body: body, status: code}} when code in 200..299 <-
           @httpoison.get(
             id,
-             [Accept: "application/activity+json"],
-             follow_redirect: true,
-             timeout: 10000,
-             recv_timeout: 20000
+             [{:Accept, "application/activity+json"}]
           ),
         {:ok, data} <- Jason.decode(body),
         :ok <- Transmogrifier.contain_origin_from_id(id, data) do