Permalink
Browse files

Removed the reliance on PATH_INFO as it was causing problems for cach…

…ing 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
  • Loading branch information...
dhh committed Mar 14, 2005
1 parent 9982578 commit 193edfbfdbaffff177c44f70f15450390741b7d2
Showing with 3 additions and 16 deletions.
  1. +2 −0 actionpack/CHANGELOG
  2. +1 −5 actionpack/lib/action_controller/request.rb
  3. +0 −11 actionpack/test/controller/request_test.rb
View
@@ -1,5 +1,7 @@
*SVN*
+* Removed the reliance on PATH_INFO as it was causing problems for caching and inhibited the new non-vhost support #822 [Nicholas Seckar]
+
* Added assigns shortcut for @response.template.assigns to controller test cases [bitsweat]. Example:
Before:
@@ -77,10 +77,6 @@ def request_uri
(%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 @@ def ssl?
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
@@ -54,17 +54,6 @@ def test_request_uri
assert_equal "/", @request.path
end
- def test_path_info
- @request.env["PATH_INFO"] = "/path/of/some/uri"
- assert_equal "/path/of/some/uri", @request.path_info
- assert_equal "/path/of/some/uri", @request.path
-
- # PATH_INFO actually has a .html suffix on many servers. But we don't want Rails to see the .html part.
- @request.env["PATH_INFO"] = "/path/of/some/uri.html"
- assert_equal "/path/of/some/uri", @request.path_info
- assert_equal "/path/of/some/uri", @request.path
- end
-
def test_host_with_port
@request.env['HTTP_HOST'] = "rubyonrails.org:8080"
assert_equal "rubyonrails.org:8080", @request.host_with_port

0 comments on commit 193edfb

Please sign in to comment.