aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-01-06 15:56:57 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-01-06 15:56:57 +0000
commit70039d1e912d61407f54813bbebc4f6a543569a7 (patch)
treea8129d86096e043266a0eab279a5f23508439885
parent393e98a85999878d832eaba2da42a8805aff54e8 (diff)
downloadrails-70039d1e912d61407f54813bbebc4f6a543569a7.tar.gz
rails-70039d1e912d61407f54813bbebc4f6a543569a7.tar.bz2
rails-70039d1e912d61407f54813bbebc4f6a543569a7.zip
Fixed WEBrick servlet slowdown over time by restricting the load path reloading to mod_ruby #372
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@342 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--railties/CHANGELOG2
-rwxr-xr-xrailties/dispatches/dispatch.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 3965573235..d14ec8fa12 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed WEBrick servlet slowdown over time by restricting the load path reloading to mod_ruby
+
* Removed Fancy Indexing as a default option on the WEBrick servlet as it made it harder to use various caching schemes
diff --git a/railties/dispatches/dispatch.rb b/railties/dispatches/dispatch.rb
index 1f0914f8d0..9b5ae760ff 100755
--- a/railties/dispatches/dispatch.rb
+++ b/railties/dispatches/dispatch.rb
@@ -6,5 +6,5 @@ require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_
# "/usr/local/lib/ruby/gems/1.8/gems/rails-0.8.0/lib/dispatcher" -- otherwise performance is severely impaired
require "dispatcher"
-ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) }
+ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) } if defined?(Apache::RubyRun)
Dispatcher.dispatch \ No newline at end of file