summary refs log tree commit
diff options
context:
space:
mode:
authorpavel <pavel.rosicky@easy.cz>2019-10-19 00:15:10 +0200
committerpavel <pavel.rosicky@easy.cz>2019-10-19 00:15:10 +0200
commitebc9bb51b00adf9f499c5ed28f024a03adb1dd06 (patch)
tree5db249e18b896ea3f660cc6be61243bbcf2116f6
parent4ffc2741ac4e54abe4f12b4c058376d6c7e770ed (diff)
downloadrack-ebc9bb51b00adf9f499c5ed28f024a03adb1dd06.tar.gz
TypeError Regexp#match?(nil) in Ruby Head
-rw-r--r--lib/rack/static.rb2
-rw-r--r--lib/rack/utils.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/rack/static.rb b/lib/rack/static.rb
index 24c40505..7332914a 100644
--- a/lib/rack/static.rb
+++ b/lib/rack/static.rb
@@ -125,7 +125,7 @@ module Rack
       if can_serve(path)
         if overwrite_file_path(path)
           env[PATH_INFO] = (add_index_root?(path) ? path + @index : @urls[path])
-        elsif @gzip && /\bgzip\b/.match?(env['HTTP_ACCEPT_ENCODING'])
+        elsif @gzip && env['HTTP_ACCEPT_ENCODING'] && /\bgzip\b/.match?(env['HTTP_ACCEPT_ENCODING'])
           path = env[PATH_INFO]
           env[PATH_INFO] += '.gz'
           response = @file_server.call(env)
diff --git a/lib/rack/utils.rb b/lib/rack/utils.rb
index 43d70a85..38d37aae 100644
--- a/lib/rack/utils.rb
+++ b/lib/rack/utils.rb
@@ -138,7 +138,7 @@ module Rack
       q_value_header.to_s.split(/\s*,\s*/).map do |part|
         value, parameters = part.split(/\s*;\s*/, 2)
         quality = 1.0
-        if md = /\Aq=([\d.]+)/.match(parameters)
+        if parameters && (md = /\Aq=([\d.]+)/.match(parameters))
           quality = md[1].to_f
         end
         [value, quality]