Merge branch 'audit-mix-audit-report' (#69) into release/2.11
# Conflicts: # lib/pleroma/http/adapter_helper/hackney.ex
This commit is contained in:
commit
9ea8d37e9f
23 changed files with 216 additions and 22 deletions
|
|
@ -161,7 +161,11 @@ config :mime, :types, %{
|
|||
"image/apng" => ["apng"]
|
||||
}
|
||||
|
||||
config :tesla, adapter: Tesla.Adapter.Hackney
|
||||
config :tesla, adapter: Tesla.Adapter.Gun
|
||||
|
||||
# Hackney 4 shares one HTTP/2 connection per host, and closing one response
|
||||
# (as the media proxy does) stops it for every other stream on it.
|
||||
config :hackney, default_protocols: [:http1]
|
||||
|
||||
# Configures http settings, upstream proxy etc.
|
||||
config :pleroma, :http,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue