Skip to content
Browse files

Make the dispatch.rb behave after being run by the WEBrick dispatcher

git-svn-id: 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 2594581 commit a6f718cfa0b633ed343a641bf6a3942476e26802 @dhh dhh committed
Showing with 1 addition and 1 deletion.
  1. +1 −1 railties/dispatches/dispatch.rb
2 railties/dispatches/dispatch.rb
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + "/../config/environment"
+require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
# If you're using RubyGems and mod_ruby, this require should be changed to an absolute path one, like:
# "/usr/local/lib/ruby/gems/1.8/gems/rails-0.8.0/lib/dispatcher" -- otherwise performance is severely impaired

0 comments on commit a6f718c

Please sign in to comment.
Something went wrong with that request. Please try again.