From 71040173cb5426a7f2e36f58050d1f9df5c043f3 Mon Sep 17 00:00:00 2001 From: Nicholas Seckar Date: Sun, 6 Aug 2006 03:24:17 +0000 Subject: 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 --- railties/lib/webrick_server.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'railties') 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 -- cgit v1.2.3