From 50bc6c5ea98494ceeda7cdb18d75defe485d9a64 Mon Sep 17 00:00:00 2001
From: Alex S <alex.strizhakov@gmail.com>
Date: Tue, 20 Aug 2019 16:09:50 +0300
Subject: tesla gun adapter supports sni

---
 lib/pleroma/http/connection.ex |  3 ++-
 lib/pleroma/http/http.ex       | 10 +---------
 mix.exs                        |  2 +-
 mix.lock                       |  2 +-
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex
index 93e661e1b..69589bc5e 100644
--- a/lib/pleroma/http/connection.ex
+++ b/lib/pleroma/http/connection.ex
@@ -10,7 +10,8 @@ defmodule Pleroma.HTTP.Connection do
   @options [
     connect_timeout: 10_000,
     timeout: 20_000,
-    pool: :federation
+    pool: :federation,
+    version: :master
   ]
 
   @doc """
diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex
index b18ce2803..89afba720 100644
--- a/lib/pleroma/http/http.ex
+++ b/lib/pleroma/http/http.ex
@@ -89,15 +89,7 @@ defmodule Pleroma.HTTP do
 
     case uri.scheme do
       "https" ->
-        adapter_opts = Keyword.get(options, :adapter, [])
-
-        tls_opts =
-          Keyword.get(adapter_opts, :tls_opts, [])
-          |> Keyword.put(:server_name_indication, host)
-
-        adapter_opts = Keyword.put(adapter_opts, :tls_opts, tls_opts)
-
-        Keyword.put(options, :adapter, adapter_opts) ++ [ssl: [server_name_indication: host]]
+        options ++ [ssl: [server_name_indication: host]]
 
       _ ->
         options
diff --git a/mix.exs b/mix.exs
index 8b1a898bf..9926a0836 100644
--- a/mix.exs
+++ b/mix.exs
@@ -114,7 +114,7 @@ defmodule Pleroma.Mixfile do
       {
         :tesla,
         github: "alex-strizhakov/tesla",
-        ref: "245f75502052e53d45cdb44f6afb481f4bd0f576",
+        ref: "9f56f950a88a9ab0c21ad351e2cfd47b98594310",
         override: true
       },
       {:cowlib, "~> 2.7.3", override: true},
diff --git a/mix.lock b/mix.lock
index 484a3a1a9..a10677c49 100644
--- a/mix.lock
+++ b/mix.lock
@@ -85,7 +85,7 @@
   "swoosh": {:hex, :swoosh, "0.23.2", "7dda95ff0bf54a2298328d6899c74dae1223777b43563ccebebb4b5d2b61df38", [:mix], [{:cowboy, "~> 1.0.1 or ~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}], "hexpm"},
   "syslog": {:git, "https://github.com/Vagabond/erlang-syslog.git", "4a6c6f2c996483e86c1320e9553f91d337bcb6aa", [tag: "1.0.5"]},
   "telemetry": {:hex, :telemetry, "0.4.0", "8339bee3fa8b91cb84d14c2935f8ecf399ccd87301ad6da6b71c09553834b2ab", [:rebar3], [], "hexpm"},
-  "tesla": {:git, "https://github.com/alex-strizhakov/tesla.git", "245f75502052e53d45cdb44f6afb481f4bd0f576", [ref: "245f75502052e53d45cdb44f6afb481f4bd0f576"]},
+  "tesla": {:git, "https://github.com/alex-strizhakov/tesla.git", "9f56f950a88a9ab0c21ad351e2cfd47b98594310", [ref: "9f56f950a88a9ab0c21ad351e2cfd47b98594310"]},
   "timex": {:hex, :timex, "3.6.1", "efdf56d0e67a6b956cc57774353b0329c8ab7726766a11547e529357ffdc1d56", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.10", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 0.1.8 or ~> 0.5 or ~> 1.0.0", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm"},
   "trailing_format_plug": {:hex, :trailing_format_plug, "0.0.7", "64b877f912cf7273bed03379936df39894149e35137ac9509117e59866e10e45", [:mix], [{:plug, "> 0.12.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
   "tzdata": {:hex, :tzdata, "0.5.21", "8cbf3607fcce69636c672d5be2bbb08687fe26639a62bdcc283d267277db7cf0", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm"},
-- 
cgit v1.2.3