Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit 71040173cb5426a7f2e36f58050d1f9df5c043f3 1 parent c06467f
@seckar seckar authored
Showing with 1 addition and 4 deletions.
  1. +1 −4 railties/lib/webrick_server.rb
View
5 railties/lib/webrick_server.rb
@@ -60,10 +60,7 @@ def self.dispatch(options = {})
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
Please sign in to comment.
Something went wrong with that request. Please try again.