Update server.rb

Fix nil rack_options by defaulting to {}
padrino · Apr 30, 2024 · 9ed5be9 · 9ed5be9
1 parent 889f662
commit 9ed5be9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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