Use a relative require for bundled rack lib

4d2ccbb3 · Jeremy Kemper · 6b06c987 · 4d2ccbb3
隐藏空白更改
内联并排

Showing with 2 addition and 1 deletion

actionpack/lib/action_controller/vendor/rack.rb actionpack/lib/action_controller/vendor/rack.rb +2 -1

未找到文件。
--- a/actionpack/lib/action_controller/vendor/rack.rb
+++ b/actionpack/lib/action_controller/vendor/rack.rb
@@ -4,5 +4,6 @@
  gem 'rack', '~> 0.4.0'
  require 'rack'
 rescue Gem::LoadError
-  require "#{File.dirname(__FILE__)}/rack-0.4.0/rack"
+  $LOAD_PATH << "#{File.dirname(__FILE__)}/rack-0.4.0"
+  require 'rack'
 end