From e43d1c226d09afe49b25f5e3a351c4c10371933a Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 7 Aug 2008 23:34:36 -0700
Subject: Inherit these from AbstractRequest instead

---
 actionpack/lib/action_controller/rack_process.rb | 50 ++----------------------
 1 file changed, 4 insertions(+), 46 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller/rack_process.rb b/actionpack/lib/action_controller/rack_process.rb
index 7e0a6b091e..aca38bde3d 100644
--- a/actionpack/lib/action_controller/rack_process.rb
+++ b/actionpack/lib/action_controller/rack_process.rb
@@ -3,7 +3,7 @@ require 'action_controller/session/cookie_store'
 
 module ActionController #:nodoc:
   class RackRequest < AbstractRequest #:nodoc:
-    attr_accessor :env, :session_options
+    attr_accessor :session_options
     attr_reader :cgi
 
     class SessionFixationAttempt < StandardError #:nodoc:
@@ -15,7 +15,7 @@ module ActionController #:nodoc:
       :session_path     => "/",             # available to all paths in app
       :session_key      => "_session_id",
       :cookie_only      => true
-    } unless const_defined?(:DEFAULT_SESSION_OPTIONS)
+    }
 
     def initialize(env, session_options = DEFAULT_SESSION_OPTIONS)
       @session_options = session_options
@@ -37,28 +37,14 @@ module ActionController #:nodoc:
       end
     end
 
-    # The request body is an IO input stream. If the RAW_POST_DATA environment
-    # variable is already set, wrap it in a StringIO.
-    def body
-      if raw_post = env['RAW_POST_DATA']
-        StringIO.new(raw_post)
-      else
-        @env['rack.input']
-      end
+    def body_stream #:nodoc:
+      @env['rack.input']
     end
 
     def key?(key)
       @env.key?(key)
     end
 
-    def query_parameters
-      @query_parameters ||= self.class.parse_query_parameters(query_string)
-    end
-
-    def request_parameters
-      @request_parameters ||= parse_formatted_request_parameters
-    end
-
     def cookies
       return {} unless @env["HTTP_COOKIE"]
 
@@ -70,34 +56,6 @@ module ActionController #:nodoc:
       @env["rack.request.cookie_hash"]
     end
 
-    def host_with_port_without_standard_port_handling
-      if forwarded = @env["HTTP_X_FORWARDED_HOST"]
-        forwarded.split(/,\s?/).last
-      elsif http_host = @env['HTTP_HOST']
-        http_host
-      elsif server_name = @env['SERVER_NAME']
-        server_name
-      else
-        "#{env['SERVER_ADDR']}:#{env['SERVER_PORT']}"
-      end
-    end
-
-    def host
-      host_with_port_without_standard_port_handling.sub(/:\d+$/, '')
-    end
-
-    def port
-      if host_with_port_without_standard_port_handling =~ /:(\d+)$/
-        $1.to_i
-      else
-        standard_port
-      end
-    end
-
-    def remote_addr
-      @env['REMOTE_ADDR']
-    end
-
     def server_port
       @env['SERVER_PORT'].to_i
     end
-- 
cgit v1.2.3