projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
respect content-type header in finger request
[akkoma]
/
lib
/
pleroma
/
gun
/
conn.ex
diff --git
a/lib/pleroma/gun/conn.ex
b/lib/pleroma/gun/conn.ex
index a3f75a4bbfb3248e361389ae6419318b9abfa799..a56625699325cda6f9bf2a65721dfe3a256f9a66 100644
(file)
--- a/
lib/pleroma/gun/conn.ex
+++ b/
lib/pleroma/gun/conn.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Gun.Conn do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Gun.Conn do
@@
-13,7
+13,7
@@
defmodule Pleroma.Gun.Conn do
opts =
opts
|> Enum.into(%{})
opts =
opts
|> Enum.into(%{})
- |> Map.put_new(:
await_up_timeout, pool_opts[:await_up
_timeout] || 5_000)
+ |> Map.put_new(:
connect_timeout, pool_opts[:connect
_timeout] || 5_000)
|> Map.put_new(:supervise, false)
|> maybe_add_tls_opts(uri)
|> Map.put_new(:supervise, false)
|> maybe_add_tls_opts(uri)
@@
-50,10
+50,10
@@
defmodule Pleroma.Gun.Conn do
with open_opts <- Map.delete(opts, :tls_opts),
{:ok, conn} <- Gun.open(proxy_host, proxy_port, open_opts),
with open_opts <- Map.delete(opts, :tls_opts),
{:ok, conn} <- Gun.open(proxy_host, proxy_port, open_opts),
- {:ok,
_} <- Gun.await_up(conn, opts[:await_up
_timeout]),
+ {:ok,
protocol} <- Gun.await_up(conn, opts[:connect
_timeout]),
stream <- Gun.connect(conn, connect_opts),
{:response, :fin, 200, _} <- Gun.await(conn, stream) do
stream <- Gun.connect(conn, connect_opts),
{:response, :fin, 200, _} <- Gun.await(conn, stream) do
- {:ok, conn}
+ {:ok, conn
, protocol
}
else
error ->
Logger.warn(
else
error ->
Logger.warn(
@@
-88,8
+88,8
@@
defmodule Pleroma.Gun.Conn do
|> Map.put(:socks_opts, socks_opts)
with {:ok, conn} <- Gun.open(proxy_host, proxy_port, opts),
|> Map.put(:socks_opts, socks_opts)
with {:ok, conn} <- Gun.open(proxy_host, proxy_port, opts),
- {:ok,
_} <- Gun.await_up(conn, opts[:await_up
_timeout]) do
- {:ok, conn}
+ {:ok,
protocol} <- Gun.await_up(conn, opts[:connect
_timeout]) do
+ {:ok, conn
, protocol
}
else
error ->
Logger.warn(
else
error ->
Logger.warn(
@@
-106,8
+106,8
@@
defmodule Pleroma.Gun.Conn do
host = Pleroma.HTTP.AdapterHelper.parse_host(host)
with {:ok, conn} <- Gun.open(host, port, opts),
host = Pleroma.HTTP.AdapterHelper.parse_host(host)
with {:ok, conn} <- Gun.open(host, port, opts),
- {:ok,
_} <- Gun.await_up(conn, opts[:await_up
_timeout]) do
- {:ok, conn}
+ {:ok,
protocol} <- Gun.await_up(conn, opts[:connect
_timeout]) do
+ {:ok, conn
, protocol
}
else
error ->
Logger.warn(
else
error ->
Logger.warn(