projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'cycles-config' into 'develop'
[akkoma]
/
lib
/
pleroma
/
http
/
adapter_helper
/
hackney.ex
diff --git
a/lib/pleroma/http/adapter_helper/hackney.ex
b/lib/pleroma/http/adapter_helper/hackney.ex
index 42e3acfec9a844db6aa5bf869342997a1671c2dd..fe3f91a72945208bfb90da07b5fcb853126b5c08 100644
(file)
--- a/
lib/pleroma/http/adapter_helper/hackney.ex
+++ b/
lib/pleroma/http/adapter_helper/hackney.ex
@@
-1,12
+1,13
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.HTTP.AdapterHelper.Hackney do
@behaviour Pleroma.HTTP.AdapterHelper
@defaults [
defmodule Pleroma.HTTP.AdapterHelper.Hackney do
@behaviour Pleroma.HTTP.AdapterHelper
@defaults [
- connect_timeout: 10_000,
- recv_timeout: 20_000,
follow_redirect: true,
follow_redirect: true,
- force_redirect: true,
- pool: :federation
+ force_redirect: true
]
@spec options(keyword(), URI.t()) :: keyword()
]
@spec options(keyword(), URI.t()) :: keyword()
@@
-19,6
+20,7
@@
defmodule Pleroma.HTTP.AdapterHelper.Hackney do
|> Keyword.merge(config_opts)
|> Keyword.merge(connection_opts)
|> add_scheme_opts(uri)
|> Keyword.merge(config_opts)
|> Keyword.merge(connection_opts)
|> add_scheme_opts(uri)
+ |> maybe_add_with_body()
|> Pleroma.HTTP.AdapterHelper.maybe_add_proxy(proxy)
end
|> Pleroma.HTTP.AdapterHelper.maybe_add_proxy(proxy)
end
@@
-27,4
+29,12
@@
defmodule Pleroma.HTTP.AdapterHelper.Hackney do
end
defp add_scheme_opts(opts, _), do: opts
end
defp add_scheme_opts(opts, _), do: opts
+
+ defp maybe_add_with_body(opts) do
+ if opts[:max_body] do
+ Keyword.put(opts, :with_body, true)
+ else
+ opts
+ end
+ end
end
end