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.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
index 69c325035b..16117a6079 100755
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -77,6 +77,10 @@ module ActionController
(%r{^\w+\://[^/]+(/.*|$)$} =~ env['REQUEST_URI']) ? $1 : env['REQUEST_URI'] # Remove domain, which webrick puts into the request_uri.
end
+ def path_info
+ env['PATH_INFO']
+ end
+
def protocol
env["HTTPS"] == "on" ? 'https://' : 'http://'
end
@@ -86,7 +90,7 @@ module ActionController
end
def path
- path = request_uri ? request_uri.split('?').first : ''
+ path = path_info ? path_info : ( request_uri ? request_uri.split('?').first : '' )
end
def port