github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 16:11:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: correctly use timeouts in FileHelper and FinalDestination (#12921)

Browse Source 
Previous refactors have lost usage of read_timeout in `FileHelper.download` and `FinalDestination` was incorrectly using `Net::HTTP.start` by setting `open_timeout` in the block instead of directly during the invocation.

Couldn't figure how to write a good test for this without slowing the spec.
This commit is contained in:
Joffrey JAFFEUX
2021-05-03 09:21:11 +02:00
committed by GitHub
parent f1e74c89a1
commit 64dda7112d
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/file_helper.rb
View File

@ -49,7 +49,8 @@ class FileHelper
max_redirects: follow_redirect ? 5 : 0,
skip_rate_limit: skip_rate_limit,
verbose: verbose,
validate_uri: validate_uri
validate_uri: validate_uri,
timeout: read_timeout
)
fd.get do |response, chunk, uri|