Move HTTP libs and middleware into ActionDispatch component

2 files changed, 3 insertions, 36 deletions

diff --git a/actionpack/lib/action_controller/base/base.rb b/actionpack/lib/action_controller/base/base.rb
index 84371643d7..c9c23008cd 100644
--- a/actionpack/lib/action_controller/base/base.rb
+++ b/actionpack/lib/action_controller/base/base.rb
@@ -232,7 +232,7 @@ module ActionController #:nodoc:
   #
   class Base
 
-    include StatusCodes
+    include ActionDispatch::StatusCodes
 
     cattr_reader :protected_instance_variables
     # Controller specific instance variables which will not be accessible inside views.
@@ -367,8 +367,8 @@ module ActionController #:nodoc:
     class << self
       def call(env)
         # HACK: For global rescue to have access to the original request and response
-        request = env["action_controller.rescue.request"] ||= Request.new(env)
-        response = env["action_controller.rescue.response"] ||= Response.new
+        request = env["action_controller.rescue.request"] ||= ActionDispatch::Request.new(env)
+        response = env["action_controller.rescue.response"] ||= ActionDispatch::Response.new
         process(request, response)
       end
 
diff --git a/actionpack/lib/action_controller/base/headers.rb b/actionpack/lib/action_controller/base/headers.rb
deleted file mode 100644
index 139669c66f..0000000000
--- a/actionpack/lib/action_controller/base/headers.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'active_support/memoizable'
-
-module ActionController
-  module Http
-    class Headers < ::Hash
-      extend ActiveSupport::Memoizable
-
-      def initialize(*args)
-         if args.size == 1 && args[0].is_a?(Hash)
-           super()
-           update(args[0])
-         else
-           super
-         end
-       end
-
-      def [](header_name)
-        if include?(header_name)
-          super
-        else
-          super(env_name(header_name))
-        end
-      end
-
-      private
-        # Converts a HTTP header name to an environment variable name.
-        def env_name(header_name)
-          "HTTP_#{header_name.upcase.gsub(/-/, '_')}"
-        end
-        memoize :env_name
-    end
-  end
-end