From: kaniini <nenolod@gmail.com>
Date: Tue, 28 May 2019 06:49:54 +0000 (+0000)
Subject: Merge branch 'respect-proxy-settings-federation' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=b949a37ef52a3a7c51f5863cf80afcb8ac1ba36f;hp=5bb843ceece57cd88e8615b4a4519d2b40309295;p=akkoma

Merge branch 'respect-proxy-settings-federation' into 'develop'

Respect proxy settings federation

See merge request pleroma/pleroma!1206
---

diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex
index 558005c19..c216cdcb1 100644
--- a/lib/pleroma/http/connection.ex
+++ b/lib/pleroma/http/connection.ex
@@ -32,9 +32,11 @@ defmodule Pleroma.HTTP.Connection do
   defp hackney_options(opts) do
     options = Keyword.get(opts, :adapter, [])
     adapter_options = Pleroma.Config.get([:http, :adapter], [])
+    proxy_url = Pleroma.Config.get([:http, :proxy_url], nil)
 
     @hackney_options
     |> Keyword.merge(adapter_options)
     |> Keyword.merge(options)
+    |> Keyword.merge(proxy: proxy_url)
   end
 end