kotovalexarian-likes-github
/
sinatra
mirror of https://github.com/sinatra/sinatra
1
0
Fork 0
Code Releases Activity

Avoid relying on $1 for setting Content-Range header, as its value might be lost. Makes test pass.

This commit is contained in:
Konstantin Haase 2010-10-10 13:41:56 +02:00
parent 480b1e8ebe
commit 44ab0902e3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/sinatra/base.rb
View File

@ -162,12 +162,12 @@ module Sinatra
response['Content-Disposition'] = 'inline'
end
sf = StaticFile.open(path, 'rb')
if (env['HTTP_RANGE'] =~ /^bytes=(\d+-\d+(?:,\d+-\d+)*)$/)
sf.ranges = $1.split(',').collect{|range| range.split('-').collect{|n| n.to_i}}
if m = /^bytes=(\d+-\d+(?:,\d+-\d+)*)$/.match(env['HTTP_RANGE'])
sf.ranges = m[1].split(',').collect{|range| range.split('-').collect{|n| n.to_i}}
sf.ranges.each do |range|
halt 416 if range[1] < range[0]
end
response['Content-Range'] = "bytes #{$1}/#{response['Content-Length']}"
response['Content-Range'] = "bytes #{m[1]}/#{response['Content-Length']}"
response['Content-Length'] = sf.ranges.dup.inject(0){|total,range| total + range[1] - range[0] + 1 }.to_s
halt 206, sf
else