Permalink
Browse files

upgrade rack-protection dependecy, remove escaped_params hack

  • Loading branch information...
1 parent 26cfcc2 commit 27fd3159ac064d5a6332accd42384202cba9db96 @rkh rkh committed Dec 30, 2011
Showing with 2 additions and 2 deletions.
  1. +1 −1 lib/sinatra/base.rb
  2. +1 −1 sinatra.gemspec
View
@@ -1377,7 +1377,7 @@ def setup_custom_logger(builder)
def setup_protection(builder)
return unless protection?
options = Hash === protection ? protection.dup : {}
- options[:except] = Array(options[:except] || :escaped_params)
+ options[:except] = Array options[:except]
options[:except] += [:session_hijacking, :remote_token] unless sessions?
builder.use Rack::Protection, options
end
View
@@ -13,6 +13,6 @@ Gem::Specification.new 'sinatra', Sinatra::VERSION do |s|
s.rdoc_options = %w[--line-numbers --inline-source --title Sinatra --main README.rdoc]
s.add_dependency 'rack', '~> 1.3', '>= 1.3.6'
- s.add_dependency 'rack-protection', '~> 1.1', '>= 1.1.2'
+ s.add_dependency 'rack-protection', '~> 1.2'
s.add_dependency 'tilt', '~> 1.3', '>= 1.3.3'
end

0 comments on commit 27fd315

Please sign in to comment.