kotovalexarian-likes-github/sinatra
1
0
Fork 0
mirror of https://github.com/sinatra/sinatra synced 2023-03-27 23:18:01 -04:00
Code Releases Activity

don't override Request#params/#user_agent when rack >= 1.1

Browse source
This commit is contained in:
Ryan Tomayko 2010-01-28 05:24:40 -08:00
parent 466cc74b8f
commit e7b5985f99
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/sinatra/base.rb
View file

@ -18,25 +18,29 @@ module Sinatra
# The request object. See Rack::Request for more info:
# http://rack.rubyforge.org/doc/classes/Rack/Request.html
class Request < Rack::Request
def user_agent
@env['HTTP_USER_AGENT']
end
# Returns an array of acceptable media types for the response
def accept
@env['HTTP_ACCEPT'].to_s.split(',').map { |a| a.strip }
end
# Override Rack 0.9.x's #params implementation (see #72 in lighthouse)
def params
self.GET.update(self.POST)
rescue EOFError, Errno::ESPIPE
self.GET
end
def secure?
(@env['HTTP_X_FORWARDED_PROTO'] || @env['rack.url_scheme']) == 'https'
end
# Override Rack < 1.1's Request#params implementation (see lh #72 for
# more info) and add a Request#user_agent method.
# XXX remove when we require rack > 1.1
if Rack.release < '1.1'
def params
self.GET.update(self.POST)
rescue EOFError, Errno::ESPIPE
self.GET
end
def user_agent
@env['HTTP_USER_AGENT']
end
end
end
# The response object. See Rack::Response and Rack::ResponseHelpers for