From e65e4f2b97027cddfc051674b4c0aa49a98bdeb1 Mon Sep 17 00:00:00 2001 From: Nathan Esquenazi Date: Fri, 3 May 2024 13:25:26 -0700 Subject: [PATCH] Update server.rb (#2290) Fix nil rack_options by defaulting to {} --- padrino-core/lib/padrino-core/server.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/padrino-core/lib/padrino-core/server.rb b/padrino-core/lib/padrino-core/server.rb index dd4fbc061..bf27d7a76 100644 --- a/padrino-core/lib/padrino-core/server.rb +++ b/padrino-core/lib/padrino-core/server.rb @@ -21,7 +21,7 @@ def self.detect_application(options) 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_options || {}).merge(options)] else [Padrino.application, options] end