aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/commands
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2011-06-06 15:56:41 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2011-06-07 11:03:02 -0500
commit8496be7e119aee0e3e0edc877a3fe3998b797d29 (patch)
tree50bcd1db24874fc7a48a0bec52abde3a1dc44fe8 /railties/lib/rails/commands
parent72cca79d36ecdc740eebf519a6be6172d7bae0fc (diff)
downloadrails-8496be7e119aee0e3e0edc877a3fe3998b797d29.tar.gz
rails-8496be7e119aee0e3e0edc877a3fe3998b797d29.tar.bz2
rails-8496be7e119aee0e3e0edc877a3fe3998b797d29.zip
Fixing Rails::Server#app under Rack::URLMap
Diffstat (limited to 'railties/lib/rails/commands')
-rw-r--r--railties/lib/rails/commands/server.rb2
1 files changed, 1 insertions, 1 deletions
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