sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity

testing without sni

This commit is contained in:
Alex S 2019-08-20 12:11:54 +03:00
parent 2a2d11f2b3
commit 5209abf09b
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pleroma/http/http.ex
View File

@ -91,9 +91,8 @@ defmodule Pleroma.HTTP do
"https" ->
adapter_opts = Keyword.get(options, :adapter, [])
tls_opts =
Keyword.get(adapter_opts, :tls_opts, [])
|> Keyword.put(:server_name_indication, host)
tls_opts = Keyword.get(adapter_opts, :tls_opts, [])
# |> Keyword.put(:server_name_indication, host)
adapter_opts = Keyword.put(adapter_opts, :tls_opts, tls_opts)

2
mix.exs
View File

@ -114,7 +114,7 @@ defmodule Pleroma.Mixfile do
{
:tesla,
github: "alex-strizhakov/tesla",
ref: "81433bd4011217323a1f443661252fdab23f5e59",
ref: "a64f34a83b579d46cc4ec7bac2ef561cc8b03f1d",
override: true
},
{:cowlib, "~> 2.7.3", override: true},

2
mix.lock
View File

@ -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", "81433bd4011217323a1f443661252fdab23f5e59", [ref: "81433bd4011217323a1f443661252fdab23f5e59"]},
"tesla": {:git, "https://github.com/alex-strizhakov/tesla.git", "a64f34a83b579d46cc4ec7bac2ef561cc8b03f1d", [ref: "a64f34a83b579d46cc4ec7bac2ef561cc8b03f1d"]},
"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"},