aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/request.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller/request.rb')
-rwxr-xr-xactionpack/lib/action_controller/request.rb13
1 files changed, 1 insertions, 12 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
index 565a2d5d81..a3e96a0fc4 100755
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -7,7 +7,7 @@ require 'action_controller/cgi_ext'
module ActionController
# CgiRequest and TestRequest provide concrete implementations.
- class AbstractRequest
+ class AbstractRequest < Rack::Request
extend ActiveSupport::Memoizable
HTTP_METHODS = %w(get head put post delete options)
@@ -424,7 +424,6 @@ EOM
end
alias referer referrer
-
def query_parameters
@query_parameters ||= self.class.parse_query_parameters(query_string)
end
@@ -433,7 +432,6 @@ EOM
@request_parameters ||= parse_formatted_request_parameters
end
-
#--
# Must be implemented in the concrete request
#++
@@ -868,11 +866,6 @@ EOM
class SessionFixationAttempt < StandardError #:nodoc:
end
- def initialize(env)
- @env = env
- super()
- end
-
%w[ AUTH_TYPE GATEWAY_INTERFACE PATH_INFO
PATH_TRANSLATED REMOTE_HOST
REMOTE_IDENT REMOTE_USER SCRIPT_NAME
@@ -911,10 +904,6 @@ EOM
@env['SERVER_PORT'].to_i
end
- def server_software
- @env['SERVER_SOFTWARE'].split("/").first
- end
-
def session_options
@env['rack.session.options'] ||= {}
end