From 08cff52f91a19aedfcbf5729d8fbb78188f96701 Mon Sep 17 00:00:00 2001
From: msz <msz@msz.katowice.pl>
Date: Wed, 13 Mar 2024 23:26:43 +0100
Subject: [PATCH] sinatra v4, rack v3 compatibility.
 https://github.com/rack/rack/pull/1663

---
 padrino-core/lib/padrino-core/server.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/padrino-core/lib/padrino-core/server.rb b/padrino-core/lib/padrino-core/server.rb
index 6fc652335..aeb87b392 100644
--- a/padrino-core/lib/padrino-core/server.rb
+++ b/padrino-core/lib/padrino-core/server.rb
@@ -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