gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-02-06 15:05:07 +00:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Fix missing timeout options in Request class (#33769)

Browse Source
This commit is contained in:
Claire 2025-01-29 09:42:20 +01:00 committed by GitHub
parent 9c85825ac6
commit bd481204b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/lib/request.rb
View File

@ -81,8 +81,11 @@ class Request
max_hops: 3, max_hops: 3,
on_redirect: ->(response, request) { re_sign_on_redirect(response, request) }, on_redirect: ->(response, request) { re_sign_on_redirect(response, request) },
}, },
}.merge(options).merge(
socket_class: use_proxy? || @allow_local ? ProxySocket : Socket, socket_class: use_proxy? || @allow_local ? ProxySocket : Socket,
}.merge(options) timeout_class: PerOperationWithDeadline,
timeout_options: TIMEOUT
)
@options = @options.merge(proxy_url) if use_proxy? @options = @options.merge(proxy_url) if use_proxy?
@headers = {} @headers = {}