diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2006-08-06 03:24:17 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2006-08-06 03:24:17 +0000 |
| commit | 71040173cb5426a7f2e36f58050d1f9df5c043f3 (patch) | |
| tree | 4f1c2047e09e8e1d9f372a82b02eb154de23a22d /railties | |
| parent | c06467fc23418fa67d461b970753cf299a88a879 (diff) | |
| download | rails-71040173cb5426a7f2e36f58050d1f9df5c043f3.tar.gz rails-71040173cb5426a7f2e36f58050d1f9df5c043f3.tar.bz2 rails-71040173cb5426a7f2e36f58050d1f9df5c043f3.zip | |
Remove requires from webrick server; they were causing dispatcher.rb to be double loaded.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4688 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/webrick_server.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/railties/lib/webrick_server.rb b/railties/lib/webrick_server.rb index 679fd1f617..8f4ddb11a3 100644 --- a/railties/lib/webrick_server.rb +++ b/railties/lib/webrick_server.rb @@ -60,10 +60,7 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet server.mount('/', DispatchServlet, options) trap("INT") { server.shutdown } - - require File.join(@server_options[:server_root], "..", "config", "environment") unless defined?(RAILS_ROOT) - require "dispatcher" - + server.start end |