From 193edfbfdbaffff177c44f70f15450390741b7d2 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Mon, 14 Mar 2005 00:25:24 +0000
Subject: 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
---
actionpack/CHANGELOG | 2 ++
actionpack/lib/action_controller/request.rb | 6 +-----
actionpack/test/controller/request_test.rb | 11 -----------
3 files changed, 3 insertions(+), 16 deletions(-)
(limited to 'actionpack')
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index cc1d9c8297..1885126032 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -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:
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
diff --git a/actionpack/test/controller/request_test.rb b/actionpack/test/controller/request_test.rb
index 513828462e..54ff84151a 100644
--- a/actionpack/test/controller/request_test.rb
+++ b/actionpack/test/controller/request_test.rb
@@ -54,17 +54,6 @@ class RequestTest < Test::Unit::TestCase
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
--
cgit v1.2.3