diff options
| author | kaniini <nenolod@gmail.com> | 2018-10-07 01:16:05 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-10-07 01:16:05 +0000 |
| commit | 4a3a46074d924f6cd61d06995298caa00184ff18 (patch) | |
| tree | 8e57c51a3e828bae5fcbaa50ab5695d0923fa291 /config | |
| parent | b638cc50b67de8b74a490285aa8504a35e87b646 (diff) | |
| parent | 7b3fff9af87bbf8e6b0cc824b7ebf681e4a614f1 (diff) | |
| download | pleroma-4a3a46074d924f6cd61d06995298caa00184ff18.tar.gz | |
Merge branch 'security/follow-always-async' into 'develop'
AP follows must be always async (closes #306)
Closes #306
See merge request pleroma/pleroma!368
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 608c035b0..c32ac9da2 100644 --- a/config/config.exs +++ b/config/config.exs @@ -109,7 +109,8 @@ config :pleroma, :fe, config :pleroma, :activitypub, accept_blocks: true, unfollow_blocked: true, - outgoing_blocks: true + outgoing_blocks: true, + follow_handshake_timeout: 500 config :pleroma, :user, deny_follow_blocked: true |