From 8496be7e119aee0e3e0edc877a3fe3998b797d29 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Mon, 6 Jun 2011 15:56:41 -0500
Subject: Fixing Rails::Server#app under Rack::URLMap

---
 railties/lib/rails/application.rb     | 4 ++++
 railties/lib/rails/commands/server.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 953233d774..5a42ac0411 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -138,6 +138,10 @@ module Rails
       @config ||= Application::Configuration.new(find_root_with_flag("config.ru", Dir.pwd))
     end
 
+    def to_app
+      self
+    end
+
   protected
 
     alias :build_middleware_stack :app
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 91c87514cf..23392276d5 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -43,7 +43,7 @@ module Rails
     end
 
     def app
-      @app ||= super.instance
+      @app ||= super.respond_to?(:to_app) ? super.to_app : super
     end
 
     def opt_parser
-- 
cgit v1.2.3