jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add httparty option config

Browse Source
This commit is contained in:
r888888888
2017-07-12 15:52:09 -07:00
parent 7f4d3052b3
commit 97ce9cafac
17 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/logical/downloads/file.rb
View File

@@ -31,7 +31,7 @@ module Downloads
}
@source, headers, @data = before_download(@source, headers, @data)
url = URI.parse(@source)
res = HTTParty.head(url, timeout: 3)
res = HTTParty.head(url, Danbooru.config.httparty_options.reverse_merge(timeout: 3))
res.content_length
end
@@ -90,7 +90,7 @@ module Downloads
validate_local_hosts(url)
begin
res = HTTParty.get(url, timeout: 10, headers: headers)
res = HTTParty.get(url, Danbooru.config.httparty_options.reverse_merge(timeout: 10, headers: headers))
if res.success?
if max_size
len = res["Content-Length"]

2
app/logical/downloads/rewrite_strategies/base.rb
View File

@@ -21,7 +21,7 @@ module Downloads
protected
def http_head_request(url, headers)
HTTParty.head(url, headers: headers)
HTTParty.head(url, Danbooru.config.httparty_options.merge(headers: headers))
end
def http_exists?(url, headers)