forked from AkkomaGang/akkoma
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
This commit is contained in:
commit
7d8f4d0d50
2 changed files with 6 additions and 1 deletions
|
@ -20,6 +20,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
||||||
- Mastodon API: Support for `include_types` in `/api/v1/notifications`.
|
- Mastodon API: Support for `include_types` in `/api/v1/notifications`.
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Gun connections pool `max_connections` option.
|
||||||
|
|
||||||
## [2.0.0] - 2019-03-08
|
## [2.0.0] - 2019-03-08
|
||||||
### Security
|
### Security
|
||||||
- Mastodon API: Fix being able to request enourmous amount of statuses in timelines leading to DoS. Now limited to 40 per request.
|
- Mastodon API: Fix being able to request enourmous amount of statuses in timelines leading to DoS. Now limited to 40 per request.
|
||||||
|
|
|
@ -49,8 +49,10 @@ defmodule Pleroma.Gun.Conn do
|
||||||
|
|
||||||
key = "#{uri.scheme}:#{uri.host}:#{uri.port}"
|
key = "#{uri.scheme}:#{uri.host}:#{uri.port}"
|
||||||
|
|
||||||
|
max_connections = pool_opts[:max_connections] || 250
|
||||||
|
|
||||||
conn_pid =
|
conn_pid =
|
||||||
if Connections.count(name) < opts[:max_connection] do
|
if Connections.count(name) < max_connections do
|
||||||
do_open(uri, opts)
|
do_open(uri, opts)
|
||||||
else
|
else
|
||||||
close_least_used_and_do_open(name, uri, opts)
|
close_least_used_and_do_open(name, uri, opts)
|
||||||
|
|
Loading…
Reference in a new issue