diff options
Diffstat (limited to 'actionpack/lib')
| -rwxr-xr-x | actionpack/lib/action_controller/request.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb index 46080b1318..429b3b9017 100755 --- a/actionpack/lib/action_controller/request.rb +++ b/actionpack/lib/action_controller/request.rb @@ -77,10 +77,6 @@ module ActionController (%r{^\w+\://[^/]+(/.*|$)$} =~ env['REQUEST_URI']) ? $1 : env['REQUEST_URI'] # Remove domain, which webrick puts into the request_uri. end - def path_info - (/^(.*)\.html$/ =~ env['PATH_INFO']) ? $1 : env['PATH_INFO'] - end - def protocol env["HTTPS"] == "on" ? 'https://' : 'http://' end @@ -90,7 +86,7 @@ module ActionController end def path - (path_info && !path_info.empty?) ? path_info : (request_uri ? request_uri.split('?').first : '') + request_uri ? request_uri.split('?').first : '' end def port |