3 files changed, 3 insertions, 16 deletions
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