diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-08 23:02:55 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-08 23:02:55 +0000 |
| commit | 5075e8abe5aca86dba68be044ce6bdfa7b9b7896 (patch) | |
| tree | 76ae3f8ca957e2b7b129efe15cd4be3acf6d293c /lib/pleroma/web | |
| parent | 46200d8facfa63343360c9e14cf94f34c55c7d53 (diff) | |
| parent | 1f78d23eed1fe80622837bc45831c406de244bef (diff) | |
| download | pleroma-5075e8abe5aca86dba68be044ce6bdfa7b9b7896.tar.gz | |
Merge branch 'bugfix/tesla-safety' into 'develop'
tesla hardening
Closes #712 and #672
See merge request pleroma/pleroma!912
Diffstat (limited to 'lib/pleroma/web')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/rel_me.ex | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/rich_media/parser.ex | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 8c58f4545..26921d386 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -1452,7 +1452,6 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do url, [], adapter: [ - timeout: timeout, recv_timeout: timeout, pool: :default ] diff --git a/lib/pleroma/web/rel_me.ex b/lib/pleroma/web/rel_me.ex index ab29a36e3..eaca41132 100644 --- a/lib/pleroma/web/rel_me.ex +++ b/lib/pleroma/web/rel_me.ex @@ -5,7 +5,6 @@ defmodule Pleroma.Web.RelMe do @hackney_options [ pool: :media, - timeout: 2_000, recv_timeout: 2_000, max_body: 2_000_000 ] diff --git a/lib/pleroma/web/rich_media/parser.ex b/lib/pleroma/web/rich_media/parser.ex index 4341141df..4bd271d8e 100644 --- a/lib/pleroma/web/rich_media/parser.ex +++ b/lib/pleroma/web/rich_media/parser.ex @@ -11,7 +11,6 @@ defmodule Pleroma.Web.RichMedia.Parser do @hackney_options [ pool: :media, - timeout: 2_000, recv_timeout: 2_000, max_body: 2_000_000 ] |