Fix #3234: Incorrect filesize on upload page.

2017-07-22 00:33:18 -05:00
parent c80291c072
commit 96fddc5bec
1 changed files with 3 additions and 3 deletions
--- 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