aboutsummaryrefslogtreecommitdiffstats
path: root/railties/dispatches
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2004-12-07 12:03:57 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2004-12-07 12:03:57 +0000
commita6f718cfa0b633ed343a641bf6a3942476e26802 (patch)
tree37e7ea01e719cf89f6080e90f61a8f9d934ec309 /railties/dispatches
parent2594581e9f5594b32918326be895b4d443ab3e9c (diff)
downloadrails-a6f718cfa0b633ed343a641bf6a3942476e26802.tar.gz
rails-a6f718cfa0b633ed343a641bf6a3942476e26802.tar.bz2
rails-a6f718cfa0b633ed343a641bf6a3942476e26802.zip
Make the dispatch.rb behave after being run by the WEBrick dispatcher
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@64 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/dispatches')
-rwxr-xr-xrailties/dispatches/dispatch.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/dispatches/dispatch.rb b/railties/dispatches/dispatch.rb
index 6ac11bbd59..1f0914f8d0 100755
--- a/railties/dispatches/dispatch.rb
+++ b/railties/dispatches/dispatch.rb
@@ -1,6 +1,6 @@
#!/usr/local/bin/ruby
-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