iv-org-mirror/shard-kemal
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/shard-kemal.git synced 2024-08-15 00:53:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Early return from range if request type is not GET

Browse source
This commit is contained in:
Sdogruyol 2017-02-04 13:35:46 +03:00
parent 0543142a10
commit 476b27892e
5 changed files with 37 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
spec/static_file_handler.cr
View file

@ -119,9 +119,9 @@ describe Kemal::StaticFileHandler do
match = response.headers["Content-Range"].match(/bytes (\d+)-(\d+)\/(\d+)/) match = response.headers["Content-Range"].match(/bytes (\d+)-(\d+)\/(\d+)/)
match.should_not be nil match.should_not be nil
if match if match
start_range = match[1].to_i {0} start_range = match[1].to_i { 0 }
end_range = match[2].to_i {0} end_range = match[2].to_i { 0 }
range_size = match[3].to_i {0} range_size = match[3].to_i { 0 }
range_size.should eq file_size range_size.should eq file_size
(end_range < file_size).should eq true (end_range < file_size).should eq true

4
src/kemal.cr
View file

@ -4,7 +4,6 @@ require "./kemal/*"
require "./kemal/helpers/*" require "./kemal/helpers/*"
module Kemal module Kemal
# Overload of self.run with the default startup logging # Overload of self.run with the default startup logging
def self.run(port = nil) def self.run(port = nil)
self.run port do self.run port do
@ -14,10 +13,9 @@ module Kemal
# Overload of self.run to allow just a block # Overload of self.run to allow just a block
def self.run(&block) def self.run(&block)
self.run nil &block self.run nil & block
end end
# The command to run a `Kemal` application. # The command to run a `Kemal` application.
# The port can be given to `#run` but is optional. # The port can be given to `#run` but is optional.
# If not given Kemal will use `Kemal::Config#port` # If not given Kemal will use `Kemal::Config#port`

1
src/kemal/response.cr
View file

@ -1,7 +1,6 @@
class HTTP::Server::Response class HTTP::Server::Response
class Output class Output
def close def close
unless response.wrote_headers? && !response.headers.has_key?("Content-Range") unless response.wrote_headers? && !response.headers.has_key?("Content-Range")
response.content_length = @out_count response.content_length = @out_count
end end

4
src/kemal/static_file_handler.cr
View file

@ -56,7 +56,7 @@ module Kemal
request_headers = context.request.headers request_headers = context.request.headers
filesize = File.size(file_path) filesize = File.size(file_path)
File.open(file_path) do |file| File.open(file_path) do |file|
if context.request.headers.has_key?("Range") && context.request.method == "GET" if context.request.method == "GET" && context.request.headers.has_key?("Range")
next multipart(file, context) next multipart(file, context)
end end
if request_headers.includes_word?("Accept-Encoding", "gzip") && config.is_a?(Hash) && config["gzip"] == true && filesize > minsize && Utils.zip_types(file_path) if request_headers.includes_word?("Accept-Encoding", "gzip") && config.is_a?(Hash) && config["gzip"] == true && filesize > minsize && Utils.zip_types(file_path)
@ -80,7 +80,7 @@ module Kemal
end end
def multipart(file, env) def multipart(file, env)
#See http://httpwg.org/specs/rfc7233.html # See http://httpwg.org/specs/rfc7233.html
fileb = file.size fileb = file.size
range = env.request.headers["Range"] range = env.request.headers["Range"]