Move bundled rack into ActionDispatch

actionpack/lib/action_controller.rb

@@ -32,13 +32,6 @@ rescue LoadError
 end
 
 require File.join(File.dirname(__FILE__), "action_pack")
-$:.unshift "#{File.dirname(__FILE__)}/action_controller/vendor/rack-1.0"
-begin
-  gem 'rack', '~> 1.0.0'
-  require 'rack'
-rescue Gem::LoadError
-  require 'action_controller/vendor/rack-1.0/rack'
-end
 
 module ActionController
   # TODO: Review explicit to see if they will automatically be handled by

actionpack/lib/action_dispatch.rb

@@ -31,9 +31,13 @@ rescue LoadError
   end
 end
 
-gem 'rack', '>= 0.9.0'
-require 'rack'
-require 'action_dispatch/rack'
+$:.unshift "#{File.dirname(__FILE__)}/action_dispatch/vendor/rack-1.0"
+begin
+  gem 'rack', '~> 1.0.0'
+  require 'rack'
+rescue Gem::LoadError
+  require 'action_dispatch/vendor/rack-1.0/rack'
+end
 
 module ActionDispatch
   autoload :Request, 'action_dispatch/http/request'

actionpack/lib/action_dispatch/rack.rb

@@ -1,3 +0,0 @@
-# require 'action_dispatch/rack/lock'
-# require 'action_dispatch/rack/multipart'
-# require 'action_dispatch/rack/parse_query'