diff options
| author | ThibG <thib@sitedethib.com> | 2018-12-18 19:37:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-18 19:37:07 +0100 |
| commit | 74ee5bdf37799fba5990a6b492e3d52c32efe8d7 (patch) | |
| tree | afdeb6b23ff4d7bd5e53c4e13cb2c3dfafb4b986 /app/models/web | |
| parent | 36d27e289177fdec5332539c94b8192022a412f2 (diff) | |
| parent | 0ef2c1415a13d305d4c73c71f27a1366eee702a0 (diff) | |
Merge pull request #862 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/web')
| -rw-r--r-- | app/models/web/push_subscription.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/web/push_subscription.rb b/app/models/web/push_subscription.rb index d19b20c48..b57807d1c 100644 --- a/app/models/web/push_subscription.rb +++ b/app/models/web/push_subscription.rb @@ -68,6 +68,9 @@ class Web::PushSubscription < ApplicationRecord p256dh: key_p256dh, auth: key_auth, ttl: ttl, + ssl_timeout: 10, + open_timeout: 10, + read_timeout: 10, vapid: { subject: "mailto:#{::Setting.site_contact_email}", private_key: Rails.configuration.x.vapid_private_key, |