diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2011-06-06 15:56:41 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2011-06-07 11:03:02 -0500 |
| commit | 8496be7e119aee0e3e0edc877a3fe3998b797d29 (patch) | |
| tree | 50bcd1db24874fc7a48a0bec52abde3a1dc44fe8 /railties/lib | |
| parent | 72cca79d36ecdc740eebf519a6be6172d7bae0fc (diff) | |
| download | rails-8496be7e119aee0e3e0edc877a3fe3998b797d29.tar.gz rails-8496be7e119aee0e3e0edc877a3fe3998b797d29.tar.bz2 rails-8496be7e119aee0e3e0edc877a3fe3998b797d29.zip | |
Fixing Rails::Server#app under Rack::URLMap
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/application.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/commands/server.rb | 2 |
2 files changed, 5 insertions, 1 deletions
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 |