aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2008-12-22 22:36:38 +0000
committerPratik Naik <pratiknaik@gmail.com>2008-12-23 00:30:32 +0000
commit7e1751111ecf3886eba313fef183d73ff1f07eb6 (patch)
tree9e7f833fbb946b9fd01f8d0a990d74376bb9b525 /actionpack/lib/action_controller
parent408ec6c0dcb901b2432c72bd3253fa691c5aede0 (diff)
downloadrails-7e1751111ecf3886eba313fef183d73ff1f07eb6.tar.gz
rails-7e1751111ecf3886eba313fef183d73ff1f07eb6.tar.bz2
rails-7e1751111ecf3886eba313fef183d73ff1f07eb6.zip
Rename RackRequest to Request
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/dispatcher.rb2
-rw-r--r--actionpack/lib/action_controller/integration.rb2
-rwxr-xr-xactionpack/lib/action_controller/request.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/dispatcher.rb b/actionpack/lib/action_controller/dispatcher.rb
index ae9f117e3f..4dc76e1b49 100644
--- a/actionpack/lib/action_controller/dispatcher.rb
+++ b/actionpack/lib/action_controller/dispatcher.rb
@@ -83,7 +83,7 @@ module ActionController
end
def _call(env)
- @request = RackRequest.new(env)
+ @request = Request.new(env)
@response = Response.new
dispatch
end
diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb
index d952c3489b..701b464c99 100644
--- a/actionpack/lib/action_controller/integration.rb
+++ b/actionpack/lib/action_controller/integration.rb
@@ -371,7 +371,7 @@ module ActionController
"SERVER_PORT" => https? ? "443" : "80",
"HTTPS" => https? ? "on" : "off"
}
- UrlRewriter.new(RackRequest.new(env), {})
+ UrlRewriter.new(Request.new(env), {})
end
def name_with_prefix(prefix, name)
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
index 7c125df55a..565a2d5d81 100755
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -862,7 +862,7 @@ EOM
include UploadedFile
end
- class RackRequest < AbstractRequest #:nodoc:
+ class Request < AbstractRequest #:nodoc:
attr_accessor :session_options
class SessionFixationAttempt < StandardError #:nodoc: