diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-14 00:25:24 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-14 00:25:24 +0000 |
| commit | 193edfbfdbaffff177c44f70f15450390741b7d2 (patch) | |
| tree | 54da535d5b1a89177d480b95b246dfa5b2a756eb /actionpack/lib/action_controller | |
| parent | 9982578efb5834a30381b51063fcf347540a0fd3 (diff) | |
| download | rails-193edfbfdbaffff177c44f70f15450390741b7d2.tar.gz rails-193edfbfdbaffff177c44f70f15450390741b7d2.tar.bz2 rails-193edfbfdbaffff177c44f70f15450390741b7d2.zip | |
Removed the reliance on PATH_INFO as it was causing problems for caching and inhibited the new non-vhost support #822 [Nicholas Seckar]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@901 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
| -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 |