From 06bf0c2622c1b42183b3f44ff5898677ed8ec1c3 Mon Sep 17 00:00:00 2001 From: Omar Roth Date: Mon, 20 May 2019 12:06:44 -0500 Subject: [PATCH] Copy proxy_file in chunks --- src/invidious/helpers/helpers.cr | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/src/invidious/helpers/helpers.cr b/src/invidious/helpers/helpers.cr index a3af679e..5ba9729b 100644 --- a/src/invidious/helpers/helpers.cr +++ b/src/invidious/helpers/helpers.cr @@ -631,19 +631,31 @@ def cache_annotation(db, id, annotations) end def proxy_file(response, env) - if response.headers["Content-Length"]? && response.headers["Content-Length"] == "0" + if !response.body_io? return end - if response.headers.includes_word?("Content-Encoding", "gzip") - Gzip::Writer.open(env.response) do |deflate| - IO.copy(response.body_io, deflate) - end - elsif response.headers.includes_word?("Content-Encoding", "deflate") - Flate::Writer.open(env.response) do |deflate| - IO.copy(response.body_io, deflate) + begin + if response.headers.includes_word?("Content-Encoding", "gzip") + Gzip::Writer.open(env.response) do |deflate| + copy_in_chunks(response.body_io, deflate) + end + elsif response.headers.includes_word?("Content-Encoding", "deflate") + Flate::Writer.open(env.response) do |deflate| + copy_in_chunks(response.body_io, deflate) + end + else + copy_in_chunks(response.body_io, env.response) end - else - IO.copy(response.body_io, env.response) + rescue ex + end +end + +# https://stackoverflow.com/a/44802810 <3 +def copy_in_chunks(input, output, chunk_size = 4096) + size = 1 + while size > 0 + size = IO.copy(input, output, chunk_size) + Fiber.yield end end