From 96fddc5bec6df26ebf4ac7161e4a223dd4f9f92a Mon Sep 17 00:00:00 2001 From: evazion Date: Sat, 22 Jul 2017 00:33:18 -0500 Subject: [PATCH] Fix #3234: Incorrect filesize on upload page. --- app/logical/downloads/file.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/logical/downloads/file.rb b/app/logical/downloads/file.rb index d8b596ec7..2b3e5424b 100644 --- a/app/logical/downloads/file.rb +++ b/app/logical/downloads/file.rb @@ -26,9 +26,9 @@ module Downloads end def size - @source, _, @data = before_download(@source, @data) - url = URI.parse(@source) - res = HTTParty.head(url, Danbooru.config.httparty_options.reverse_merge(timeout: 3)) + @source, headers, @data = before_download(@source, @data) + options = { timeout: 3, headers: headers }.deep_merge(Danbooru.config.httparty_options) + res = HTTParty.head(@source, options) res.content_length end