Skip to content

Commit

Permalink
sinatra v4, rack v3 compatibility. rack/rack#1663
Browse files Browse the repository at this point in the history
  • Loading branch information
msz-kp committed Mar 13, 2024
1 parent 86ed814 commit 08cff52
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions padrino-core/lib/padrino-core/server.rb
Expand Up @@ -20,8 +20,9 @@ def self.detect_application(options)
if (config_file = options.delete(:config)) || File.file?(default_config_file)
config_file ||= default_config_file
fail "Rack config file `#{config_file}` must have `.ru` extension" unless config_file =~ /\.ru$/
rack_app, rack_options = Rack::Builder.parse_file(config_file)
[rack_app, rack_options.merge(options)]
rack_app, _ = Rack::Builder.parse_file(config_file)

[rack_app, options]
else
[Padrino.application, options]
end
Expand Down

0 comments on commit 08cff52

Please sign in to comment.