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

fix default options not overriding options

Browse source
This commit is contained in:
Konstantin Haase 2011-05-24 10:56:19 +02:00
parent 3384ede80d
commit 40f5a0c0fa
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rack-protection/lib/rack/protection/base.rb
View file

@ -15,7 +15,7 @@ module Rack
end
def initialize(app, options = {})
@app, @options = app, options.merge(default_options)
@app, @options = app, default_options.merge(options)
end
def accepts?(env)