AbstractRequest.relative_url_root is no longer automatically configured by a HTTP header. It can now be set in your configuration environment with config.action_controller.relative_url_root

11 files changed, 161 insertions, 219 deletions

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index ebe4c047b8..03e011c75c 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *Edge*
 
+* AbstractRequest.relative_url_root is no longer automatically configured by a HTTP header. It can now be set in your configuration environment with config.action_controller.relative_url_root [Josh Peek]
+
 * Update Prototype to 1.6.0.2 #599 [Patrick Joyce]
 
 * Conditional GET utility methods.  [Jeremy Kemper]
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 4dabff637b..bae7e8c12e 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -354,6 +354,10 @@ module ActionController #:nodoc:
     class_inheritable_accessor :allow_forgery_protection
     self.allow_forgery_protection = true
 
+    # If you are deploying to a subdirectory, you will need to set
+    # <tt>config.action_controller.relative_url_root</tt>
+    class_inheritable_accessor :relative_url_root
+
     # Holds the request object that's primarily used to get environment variables through access like
     # <tt>request.env["REQUEST_URI"]</tt>.
     attr_internal :request
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
index c42f113d2c..c55788a531 100755
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -3,13 +3,16 @@ require 'stringio'
 require 'strscan'
 
 module ActionController
-  # HTTP methods which are accepted by default. 
+  # HTTP methods which are accepted by default.
   ACCEPTED_HTTP_METHODS = Set.new(%w( get head put post delete options ))
 
   # CgiRequest and TestRequest provide concrete implementations.
   class AbstractRequest
-    cattr_accessor :relative_url_root
-    remove_method :relative_url_root
+    def self.relative_url_root=(*args)
+      ActiveSupport::Deprecation.warn(
+        "ActionController::AbstractRequest.relative_url_root= has been renamed." +
+        "You can now set it with config.action_controller.relative_url_root=", caller)
+    end
 
     # The hash of environment variables for this request,
     # such as { 'RAILS_ENV' => 'production' }.
@@ -111,14 +114,14 @@ module ActionController
         end
       end
     end
-    
-    
+
+
     # Sets the format by string extension, which can be used to force custom formats that are not controlled by the extension.
     # Example:
     #
     #   class ApplicationController < ActionController::Base
     #     before_filter :adjust_format_for_iphone
-    #   
+    #
     #     private
     #       def adjust_format_for_iphone
     #         request.format = :iphone if request.env["HTTP_USER_AGENT"][/iPhone/]
@@ -303,26 +306,10 @@ EOM
       path = (uri = request_uri) ? uri.split('?').first.to_s : ''
 
       # Cut off the path to the installation directory if given
-      path.sub!(%r/^#{relative_url_root}/, '')
-      path || ''      
-    end
-    
-    # Returns the path minus the web server relative installation directory.
-    # This can be set with the environment variable RAILS_RELATIVE_URL_ROOT.
-    # It can be automatically extracted for Apache setups. If the server is not
-    # Apache, this method returns an empty string.
-    def relative_url_root
-      @@relative_url_root ||= case
-        when @env["RAILS_RELATIVE_URL_ROOT"]
-          @env["RAILS_RELATIVE_URL_ROOT"]
-        when server_software == 'apache'
-          @env["SCRIPT_NAME"].to_s.sub(/\/dispatch\.(fcgi|rb|cgi)$/, '')
-        else
-          ''
-      end
+      path.sub!(%r/^#{ActionController::Base.relative_url_root}/, '')
+      path || ''
     end
 
-
     # Read the request body. This is useful for web services that need to
     # work with raw requests directly.
     def raw_post
@@ -343,15 +330,15 @@ EOM
       @symbolized_path_parameters = @parameters = nil
     end
 
-    # The same as <tt>path_parameters</tt> with explicitly symbolized keys 
-    def symbolized_path_parameters 
+    # The same as <tt>path_parameters</tt> with explicitly symbolized keys
+    def symbolized_path_parameters
       @symbolized_path_parameters ||= path_parameters.symbolize_keys
     end
 
     # Returns a hash with the parameters used to form the path of the request.
     # Returned hash keys are strings.  See <tt>symbolized_path_parameters</tt> for symbolized keys.
     #
-    # Example: 
+    # Example:
     #
     #   {'action' => 'my_action', 'controller' => 'my_controller'}
     def path_parameters
diff --git a/actionpack/lib/action_controller/routing/optimisations.rb b/actionpack/lib/action_controller/routing/optimisations.rb
index cd4a423e6b..4b70ea13f2 100644
--- a/actionpack/lib/action_controller/routing/optimisations.rb
+++ b/actionpack/lib/action_controller/routing/optimisations.rb
@@ -76,7 +76,7 @@ module ActionController
             elements << '#{request.host_with_port}'
           end
 
-          elements << '#{request.relative_url_root if request.relative_url_root}'
+          elements << '#{ActionController::Base.relative_url_root if ActionController::Base.relative_url_root}'
 
           # The last entry in <tt>route.segments</tt> appears to *always* be a
           # 'divider segment' for '/' but we have assertions to ensure that
diff --git a/actionpack/lib/action_controller/url_rewriter.rb b/actionpack/lib/action_controller/url_rewriter.rb
index 3a38f23396..d0bf6c0bd4 100644
--- a/actionpack/lib/action_controller/url_rewriter.rb
+++ b/actionpack/lib/action_controller/url_rewriter.rb
@@ -37,7 +37,7 @@ module ActionController
     # * <tt>:port</tt> - Optionally specify the port to connect to.
     # * <tt>:anchor</tt> - An anchor name to be appended to the path.
     # * <tt>:skip_relative_url_root</tt> - If true, the url is not constructed using the
-    #   +relative_url_root+ set in ActionController::AbstractRequest.relative_url_root.
+    #   +relative_url_root+ set in ActionController::Base.relative_url_root.
     # * <tt>:trailing_slash</tt> - If true, adds a trailing slash, as in "/archive/2009/"
     #
     # Any other key (<tt>:controller</tt>, <tt>:action</tt>, etc.) given to
@@ -67,7 +67,7 @@ module ActionController
         [:protocol, :host, :port, :skip_relative_url_root].each { |k| options.delete(k) }
       end
       trailing_slash = options.delete(:trailing_slash) if options.key?(:trailing_slash)
-      url << ActionController::AbstractRequest.relative_url_root.to_s unless options[:skip_relative_url_root]
+      url << ActionController::Base.relative_url_root.to_s unless options[:skip_relative_url_root]
       anchor = "##{CGI.escape options.delete(:anchor).to_param.to_s}" if options[:anchor]
       generated = Routing::Routes.generate(options, {})
       url << (trailing_slash ? generated.sub(/\?|\z/) { "/" + $& } : generated)
@@ -108,7 +108,7 @@ module ActionController
         end
 
         path = rewrite_path(options)
-        rewritten_url << @request.relative_url_root.to_s unless options[:skip_relative_url_root]
+        rewritten_url << ActionController::Base.relative_url_root.to_s unless options[:skip_relative_url_root]
         rewritten_url << (options[:trailing_slash] ? path.sub(/\?|\z/) { "/" + $& } : path)
         rewritten_url << "##{options[:anchor]}" if options[:anchor]
 
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 8d0ee81684..769eada120 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -476,7 +476,7 @@ module ActionView
             if has_request
               [ @controller.request.protocol,
                 ActionController::Base.asset_host.to_s,
-                @controller.request.relative_url_root,
+                ActionController::Base.relative_url_root,
                 dir, source, ext, include_host ].join
             else
               [ ActionController::Base.asset_host.to_s,
@@ -492,8 +492,8 @@ module ActionView
               else
                 source = "/#{dir}/#{source}" unless source[0] == ?/
                 if has_request
-                  unless source =~ %r{^#{@controller.request.relative_url_root}/}
-                    source = "#{@controller.request.relative_url_root}#{source}"
+                  unless source =~ %r{^#{ActionController::Base.relative_url_root}/}
+                    source = "#{ActionController::Base.relative_url_root}#{source}"
                   end
                 end
 
diff --git a/actionpack/test/controller/redirect_test.rb b/actionpack/test/controller/redirect_test.rb
index 28da5c6163..2f8bf7b6ee 100755
--- a/actionpack/test/controller/redirect_test.rb
+++ b/actionpack/test/controller/redirect_test.rb
@@ -9,11 +9,11 @@ class Workshop
   def initialize(id, new_record)
     @id, @new_record = id, new_record
   end
-  
+
   def new_record?
     @new_record
   end
-  
+
   def to_s
     id.to_s
   end
@@ -24,32 +24,32 @@ class RedirectController < ActionController::Base
     redirect_to :action => "hello_world"
   end
 
-  def redirect_with_status 
+  def redirect_with_status
     redirect_to({:action => "hello_world", :status => 301})
-  end 
+  end
 
   def redirect_with_status_hash
     redirect_to({:action => "hello_world"}, {:status => 301})
-  end 
+  end
 
-  def url_redirect_with_status 
+  def url_redirect_with_status
     redirect_to("http://www.example.com", :status => :moved_permanently)
-  end 
-   
-  def url_redirect_with_status_hash 
+  end
+
+  def url_redirect_with_status_hash
     redirect_to("http://www.example.com", {:status => 301})
-  end 
+  end
 
-  def relative_url_redirect_with_status 
+  def relative_url_redirect_with_status
     redirect_to("/things/stuff", :status => :found)
-  end 
-   
+  end
+
   def relative_url_redirect_with_status_hash
     redirect_to("/things/stuff", {:status => 301})
-  end 
-   
-  def redirect_to_back_with_status 
-    redirect_to :back, :status => 307 
+  end
+
+  def redirect_to_back_with_status
+    redirect_to :back, :status => 307
   end
 
   def host_redirect
@@ -90,9 +90,9 @@ class RedirectController < ActionController::Base
   end
 
   def rescue_errors(e) raise e end
-    
+
   def rescue_action(e) raise end
-  
+
   protected
     def dashbord_url(id, message)
       url_for :action => "dashboard", :params => { "id" => id, "message" => message }
@@ -118,48 +118,48 @@ class RedirectTest < Test::Unit::TestCase
     assert_equal "http://test.host/redirect/hello_world", redirect_to_url
   end
 
-  def test_redirect_with_status 
-    get :redirect_with_status 
-    assert_response 301 
-    assert_equal "http://test.host/redirect/hello_world", redirect_to_url 
-  end 
+  def test_redirect_with_status
+    get :redirect_with_status
+    assert_response 301
+    assert_equal "http://test.host/redirect/hello_world", redirect_to_url
+  end
 
-  def test_redirect_with_status_hash 
+  def test_redirect_with_status_hash
     get :redirect_with_status_hash
-    assert_response 301 
-    assert_equal "http://test.host/redirect/hello_world", redirect_to_url 
+    assert_response 301
+    assert_equal "http://test.host/redirect/hello_world", redirect_to_url
+  end
+
+  def test_url_redirect_with_status
+    get :url_redirect_with_status
+    assert_response 301
+    assert_equal "http://www.example.com", redirect_to_url
   end
-   
-  def test_url_redirect_with_status 
-    get :url_redirect_with_status 
-    assert_response 301 
-    assert_equal "http://www.example.com", redirect_to_url 
-  end 
 
   def test_url_redirect_with_status_hash
     get :url_redirect_with_status_hash
-    assert_response 301 
-    assert_equal "http://www.example.com", redirect_to_url 
-  end 
+    assert_response 301
+    assert_equal "http://www.example.com", redirect_to_url
+  end
 
-  
-  def test_relative_url_redirect_with_status 
-    get :relative_url_redirect_with_status 
+
+  def test_relative_url_redirect_with_status
+    get :relative_url_redirect_with_status
     assert_response 302
-    assert_equal "http://test.host/things/stuff", redirect_to_url 
-  end 
-   
+    assert_equal "http://test.host/things/stuff", redirect_to_url
+  end
+
   def test_relative_url_redirect_with_status_hash
     get :relative_url_redirect_with_status_hash
-    assert_response 301 
-    assert_equal "http://test.host/things/stuff", redirect_to_url 
-  end   
-   
-  def test_redirect_to_back_with_status 
-    @request.env["HTTP_REFERER"] = "http://www.example.com/coming/from" 
-    get :redirect_to_back_with_status 
-    assert_response 307 
-    assert_equal "http://www.example.com/coming/from", redirect_to_url 
+    assert_response 301
+    assert_equal "http://test.host/things/stuff", redirect_to_url
+  end
+
+  def test_redirect_to_back_with_status
+    @request.env["HTTP_REFERER"] = "http://www.example.com/coming/from"
+    get :redirect_to_back_with_status
+    assert_response 307
+    assert_equal "http://www.example.com/coming/from", redirect_to_url
   end
 
   def test_simple_redirect_using_options
@@ -204,20 +204,20 @@ class RedirectTest < Test::Unit::TestCase
     assert_response :redirect
     assert_equal "http://www.example.com/coming/from", redirect_to_url
   end
-  
+
   def test_redirect_to_back_with_no_referer
     assert_raises(ActionController::RedirectBackError) {
       @request.env["HTTP_REFERER"] = nil
       get :redirect_to_back
     }
   end
-  
+
   def test_redirect_to_record
     ActionController::Routing::Routes.draw do |map|
       map.resources :workshops
       map.connect ':controller/:action/:id'
     end
-    
+
     get :redirect_to_existing_record
     assert_equal "http://test.host/workshops/5", redirect_to_url
     assert_redirected_to Workshop.new(5, false)
@@ -237,7 +237,6 @@ class RedirectTest < Test::Unit::TestCase
       get :redirect_to_nil
     end
   end
-
 end
 
 module ModuleTest
diff --git a/actionpack/test/controller/request_test.rb b/actionpack/test/controller/request_test.rb
index 932c0e21a1..7db5264840 100644
--- a/actionpack/test/controller/request_test.rb
+++ b/actionpack/test/controller/request_test.rb
@@ -3,9 +3,14 @@ require 'action_controller/integration'
 
 class RequestTest < Test::Unit::TestCase
   def setup
+    ActionController::Base.relative_url_root = nil
     @request = ActionController::TestRequest.new
   end
 
+  def teardown
+    ActionController::Base.relative_url_root = nil
+  end
+
   def test_remote_ip
     assert_equal '0.0.0.0', @request.remote_ip
 
@@ -38,7 +43,7 @@ class RequestTest < Test::Unit::TestCase
 
     @request.env['HTTP_X_FORWARDED_FOR'] = '10.0.0.1,3.4.5.6'
     assert_equal '3.4.5.6', @request.remote_ip
-    
+
     @request.env['HTTP_X_FORWARDED_FOR'] = '10.0.0.1, 10.0.0.1, 3.4.5.6'
     assert_equal '3.4.5.6', @request.remote_ip
 
@@ -120,155 +125,105 @@ class RequestTest < Test::Unit::TestCase
     assert_equal ":8080", @request.port_string
   end
 
-  def test_relative_url_root
-    @request.env['SCRIPT_NAME'] = "/hieraki/dispatch.cgi"
-    @request.env['SERVER_SOFTWARE'] = 'lighttpd/1.2.3'
-    assert_equal '', @request.relative_url_root, "relative_url_root should be disabled on lighttpd"
-
-    @request.env['SERVER_SOFTWARE'] = 'apache/1.2.3 some random text'
-
-    @request.env['SCRIPT_NAME'] = nil
-    assert_equal "", @request.relative_url_root
-
-    @request.env['SCRIPT_NAME'] = "/dispatch.cgi"
-    assert_equal "", @request.relative_url_root
-
-    @request.env['SCRIPT_NAME'] = "/myapp.rb"
-    assert_equal "", @request.relative_url_root
-
-    @request.relative_url_root = nil
-    @request.env['SCRIPT_NAME'] = "/hieraki/dispatch.cgi"
-    assert_equal "/hieraki", @request.relative_url_root
-
-    @request.relative_url_root = nil
-    @request.env['SCRIPT_NAME'] = "/collaboration/hieraki/dispatch.cgi"
-    assert_equal "/collaboration/hieraki", @request.relative_url_root
-
-    # apache/scgi case
-    @request.relative_url_root = nil
-    @request.env['SCRIPT_NAME'] = "/collaboration/hieraki"
-    assert_equal "/collaboration/hieraki", @request.relative_url_root
-
-    @request.relative_url_root = nil
-    @request.env['SCRIPT_NAME'] = "/hieraki/dispatch.cgi"
-    @request.env['SERVER_SOFTWARE'] = 'lighttpd/1.2.3'
-    @request.env['RAILS_RELATIVE_URL_ROOT'] = "/hieraki"
-    assert_equal "/hieraki", @request.relative_url_root
-
-    # @env overrides path guess
-    @request.relative_url_root = nil
-    @request.env['SCRIPT_NAME'] = "/hieraki/dispatch.cgi"
-    @request.env['SERVER_SOFTWARE'] = 'apache/1.2.3 some random text'
-    @request.env['RAILS_RELATIVE_URL_ROOT'] = "/real_url"
-    assert_equal "/real_url", @request.relative_url_root
-  end
-
   def test_request_uri
     @request.env['SERVER_SOFTWARE'] = 'Apache 42.342.3432'
 
-    @request.relative_url_root = nil
     @request.set_REQUEST_URI "http://www.rubyonrails.org/path/of/some/uri?mapped=1"
     assert_equal "/path/of/some/uri?mapped=1", @request.request_uri
     assert_equal "/path/of/some/uri", @request.path
 
-    @request.relative_url_root = nil
     @request.set_REQUEST_URI "http://www.rubyonrails.org/path/of/some/uri"
     assert_equal "/path/of/some/uri", @request.request_uri
     assert_equal "/path/of/some/uri", @request.path
 
-    @request.relative_url_root = nil
     @request.set_REQUEST_URI "/path/of/some/uri"
     assert_equal "/path/of/some/uri", @request.request_uri
     assert_equal "/path/of/some/uri", @request.path
 
-    @request.relative_url_root = nil
     @request.set_REQUEST_URI "/"
     assert_equal "/", @request.request_uri
     assert_equal "/", @request.path
 
-    @request.relative_url_root = nil
     @request.set_REQUEST_URI "/?m=b"
     assert_equal "/?m=b", @request.request_uri
     assert_equal "/", @request.path
 
-    @request.relative_url_root = nil
     @request.set_REQUEST_URI "/"
     @request.env['SCRIPT_NAME'] = "/dispatch.cgi"
     assert_equal "/", @request.request_uri
     assert_equal "/", @request.path
 
-    @request.relative_url_root = nil
+    ActionController::Base.relative_url_root = "/hieraki"
     @request.set_REQUEST_URI "/hieraki/"
     @request.env['SCRIPT_NAME'] = "/hieraki/dispatch.cgi"
     assert_equal "/hieraki/", @request.request_uri
     assert_equal "/", @request.path
+    ActionController::Base.relative_url_root = nil
 
-    @request.relative_url_root = nil
+    ActionController::Base.relative_url_root = "/collaboration/hieraki"
     @request.set_REQUEST_URI "/collaboration/hieraki/books/edit/2"
     @request.env['SCRIPT_NAME'] = "/collaboration/hieraki/dispatch.cgi"
     assert_equal "/collaboration/hieraki/books/edit/2", @request.request_uri
     assert_equal "/books/edit/2", @request.path
+    ActionController::Base.relative_url_root = nil
 
     # The following tests are for when REQUEST_URI is not supplied (as in IIS)
-    @request.relative_url_root = nil
     @request.set_REQUEST_URI nil
     @request.env['PATH_INFO'] = "/path/of/some/uri?mapped=1"
     @request.env['SCRIPT_NAME'] = nil #"/path/dispatch.rb"
     assert_equal "/path/of/some/uri?mapped=1", @request.request_uri
     assert_equal "/path/of/some/uri", @request.path
 
+    ActionController::Base.relative_url_root = '/path'
     @request.set_REQUEST_URI nil
-    @request.relative_url_root = nil
     @request.env['PATH_INFO'] = "/path/of/some/uri?mapped=1"
     @request.env['SCRIPT_NAME'] = "/path/dispatch.rb"
     assert_equal "/path/of/some/uri?mapped=1", @request.request_uri
     assert_equal "/of/some/uri", @request.path
+    ActionController::Base.relative_url_root = nil
 
     @request.set_REQUEST_URI nil
-    @request.relative_url_root = nil
     @request.env['PATH_INFO'] = "/path/of/some/uri"
     @request.env['SCRIPT_NAME'] = nil
     assert_equal "/path/of/some/uri", @request.request_uri
     assert_equal "/path/of/some/uri", @request.path
 
     @request.set_REQUEST_URI nil
-    @request.relative_url_root = nil
     @request.env['PATH_INFO'] = "/"
     assert_equal "/", @request.request_uri
     assert_equal "/", @request.path
 
     @request.set_REQUEST_URI nil
-    @request.relative_url_root = nil
     @request.env['PATH_INFO'] = "/?m=b"
     assert_equal "/?m=b", @request.request_uri
     assert_equal "/", @request.path
 
     @request.set_REQUEST_URI nil
-    @request.relative_url_root = nil
     @request.env['PATH_INFO'] = "/"
     @request.env['SCRIPT_NAME'] = "/dispatch.cgi"
     assert_equal "/", @request.request_uri
     assert_equal "/", @request.path
 
+    ActionController::Base.relative_url_root = '/hieraki'
     @request.set_REQUEST_URI nil
-    @request.relative_url_root = nil
     @request.env['PATH_INFO'] = "/hieraki/"
     @request.env['SCRIPT_NAME'] = "/hieraki/dispatch.cgi"
     assert_equal "/hieraki/", @request.request_uri
     assert_equal "/", @request.path
+    ActionController::Base.relative_url_root = nil
 
     @request.set_REQUEST_URI '/hieraki/dispatch.cgi'
-    @request.relative_url_root = '/hieraki'
+    ActionController::Base.relative_url_root = '/hieraki'
     assert_equal "/dispatch.cgi", @request.path
-    @request.relative_url_root = nil
+    ActionController::Base.relative_url_root = nil
 
     @request.set_REQUEST_URI '/hieraki/dispatch.cgi'
-    @request.relative_url_root = '/foo'
+    ActionController::Base.relative_url_root = '/foo'
     assert_equal "/hieraki/dispatch.cgi", @request.path
-    @request.relative_url_root = nil
+    ActionController::Base.relative_url_root = nil
 
     # This test ensures that Rails uses REQUEST_URI over PATH_INFO
-    @request.relative_url_root = nil
+    ActionController::Base.relative_url_root = nil
     @request.env['REQUEST_URI'] = "/some/path"
     @request.env['PATH_INFO'] = "/another/path"
     @request.env['SCRIPT_NAME'] = "/dispatch.cgi"
@@ -276,13 +231,12 @@ class RequestTest < Test::Unit::TestCase
     assert_equal "/some/path", @request.path
   end
 
-
   def test_host_with_default_port
     @request.host = "rubyonrails.org"
     @request.port = 80
     assert_equal "rubyonrails.org", @request.host_with_port
   end
-  
+
   def test_host_with_non_default_port
     @request.host = "rubyonrails.org"
     @request.port = 81
@@ -415,15 +369,15 @@ class RequestTest < Test::Unit::TestCase
     @request.env["CONTENT_TYPE"] = "application/xml; charset=UTF-8"
     assert_equal Mime::XML, @request.content_type
   end
-  
+
   def test_user_agent
     assert_not_nil @request.user_agent
   end
-  
+
   def test_parameters
     @request.instance_eval { @request_parameters = { "foo" => 1 } }
     @request.instance_eval { @query_parameters = { "bar" => 2 } }
-    
+
     assert_equal({"foo" => 1, "bar" => 2}, @request.parameters)
     assert_equal({"foo" => 1}, @request.request_parameters)
     assert_equal({"bar" => 2}, @request.query_parameters)
@@ -774,19 +728,19 @@ class MultipartRequestParameterParsingTest < Test::Unit::TestCase
 
     file = params['file']
     foo  = params['foo']
-    
+
     if RUBY_VERSION > '1.9'
       assert_kind_of File, file
     else
       assert_kind_of Tempfile, file
     end
-    
+
     assert_equal 'file.txt', file.original_filename
     assert_equal "text/plain", file.content_type
-    
+
     assert_equal 'bar', foo
   end
-  
+
   def test_large_text_file
     params = process('large_text_file')
     assert_equal %w(file foo), params.keys.sort
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 079189d7b3..84996fd6b1 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -731,15 +731,10 @@ uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
     def request
       @request ||= MockRequest.new(:host => "named.route.test", :method => :get)
     end
-
-    def relative_url_root=(value)
-      request.relative_url_root=value
-    end
   end
 
   class MockRequest
-    attr_accessor :path, :path_parameters, :host, :subdomains, :domain,
-                  :method, :relative_url_root
+    attr_accessor :path, :path_parameters, :host, :subdomains, :domain, :method
 
     def initialize(values={})
       values.each { |key, value| send("#{key}=", value) }
@@ -920,10 +915,11 @@ uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
     def test_basic_named_route_with_relative_url_root
       rs.add_named_route :home, '', :controller => 'content', :action => 'list'
       x = setup_for_named_route
-      x.relative_url_root="/foo"
+      ActionController::Base.relative_url_root = "/foo"
       assert_equal("http://named.route.test/foo/",
                    x.send(:home_url))
       assert_equal "/foo/", x.send(:home_path)
+      ActionController::Base.relative_url_root = nil
     end
 
     def test_named_route_with_option
diff --git a/actionpack/test/controller/url_rewriter_test.rb b/actionpack/test/controller/url_rewriter_test.rb
index a9974db5d5..64e9a085ca 100644
--- a/actionpack/test/controller/url_rewriter_test.rb
+++ b/actionpack/test/controller/url_rewriter_test.rb
@@ -7,7 +7,7 @@ class UrlRewriterTests < Test::Unit::TestCase
     @request = ActionController::TestRequest.new
     @params = {}
     @rewriter = ActionController::UrlRewriter.new(@request, @params)
-  end 
+  end
 
   def test_port
     assert_equal('http://test.host:1271/c/a/i',
@@ -24,7 +24,7 @@ class UrlRewriterTests < Test::Unit::TestCase
       @rewriter.rewrite(:protocol => 'https://', :controller => 'c', :action => 'a', :id => 'i')
     )
   end
-  
+
   def test_user_name_and_password
     assert_equal(
       'http://david:secret@test.host/c/a/i',
@@ -38,12 +38,12 @@ class UrlRewriterTests < Test::Unit::TestCase
       @rewriter.rewrite(:user => "openid.aol.com/nextangler", :password => "one two?", :controller => 'c', :action => 'a', :id => 'i')
     )
   end
-  
-  def test_anchor 
-    assert_equal( 
-      'http://test.host/c/a/i#anchor', 
-      @rewriter.rewrite(:controller => 'c', :action => 'a', :id => 'i', :anchor => 'anchor') 
-    ) 
+
+  def test_anchor
+    assert_equal(
+      'http://test.host/c/a/i#anchor',
+      @rewriter.rewrite(:controller => 'c', :action => 'a', :id => 'i', :anchor => 'anchor')
+    )
   end
 
   def test_overwrite_params
@@ -55,12 +55,12 @@ class UrlRewriterTests < Test::Unit::TestCase
     u = @rewriter.rewrite(:only_path => false, :overwrite_params => {:action => 'hi'})
     assert_match %r(/hi/hi/2$), u
   end
-  
+
   def test_overwrite_removes_original
     @params[:controller] = 'search'
     @params[:action] = 'list'
     @params[:list_page] = 1
-    
+
     assert_equal '/search/list?list_page=2', @rewriter.rewrite(:only_path => true, :overwrite_params => {"list_page" => 2})
     u = @rewriter.rewrite(:only_path => false, :overwrite_params => {:list_page => 2})
     assert_equal 'http://test.host/search/list?list_page=2', u
@@ -86,19 +86,19 @@ class UrlRewriterTests < Test::Unit::TestCase
 end
 
 class UrlWriterTests < Test::Unit::TestCase
-  
+
   class W
     include ActionController::UrlWriter
   end
-  
+
   def teardown
     W.default_url_options.clear
   end
-  
+
   def add_host!
     W.default_url_options[:host] = 'www.basecamphq.com'
   end
-  
+
   def test_exception_is_thrown_without_host
     assert_raises RuntimeError do
       W.new.url_for :controller => 'c', :action => 'a', :id => 'i'
@@ -110,35 +110,35 @@ class UrlWriterTests < Test::Unit::TestCase
       W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :anchor => 'anchor')
     )
   end
-  
+
   def test_default_host
     add_host!
     assert_equal('http://www.basecamphq.com/c/a/i',
       W.new.url_for(:controller => 'c', :action => 'a', :id => 'i')
     )
   end
-  
+
   def test_host_may_be_overridden
     add_host!
     assert_equal('http://37signals.basecamphq.com/c/a/i',
       W.new.url_for(:host => '37signals.basecamphq.com', :controller => 'c', :action => 'a', :id => 'i')
     )
   end
-  
+
   def test_port
     add_host!
     assert_equal('http://www.basecamphq.com:3000/c/a/i',
       W.new.url_for(:controller => 'c', :action => 'a', :id => 'i', :port => 3000)
     )
   end
-  
+
   def test_protocol
     add_host!
     assert_equal('https://www.basecamphq.com/c/a/i',
       W.new.url_for(:controller => 'c', :action => 'a', :id => 'i', :protocol => 'https')
     )
   end
-  
+
   def test_protocol_with_and_without_separator
     add_host!
     assert_equal('https://www.basecamphq.com/c/a/i',
@@ -184,15 +184,15 @@ class UrlWriterTests < Test::Unit::TestCase
   end
 
   def test_relative_url_root_is_respected
-    orig_relative_url_root = ActionController::AbstractRequest.relative_url_root
-    ActionController::AbstractRequest.relative_url_root = '/subdir'
+    orig_relative_url_root = ActionController::Base.relative_url_root
+    ActionController::Base.relative_url_root = '/subdir'
 
     add_host!
     assert_equal('https://www.basecamphq.com/subdir/c/a/i',
       W.new.url_for(:controller => 'c', :action => 'a', :id => 'i', :protocol => 'https')
     )
   ensure
-    ActionController::AbstractRequest.relative_url_root = orig_relative_url_root
+    ActionController::Base.relative_url_root = orig_relative_url_root
   end
 
   def test_named_routes
@@ -217,8 +217,8 @@ class UrlWriterTests < Test::Unit::TestCase
   end
 
   def test_relative_url_root_is_respected_for_named_routes
-    orig_relative_url_root = ActionController::AbstractRequest.relative_url_root
-    ActionController::AbstractRequest.relative_url_root = '/subdir'
+    orig_relative_url_root = ActionController::Base.relative_url_root
+    ActionController::Base.relative_url_root = '/subdir'
 
     ActionController::Routing::Routes.draw do |map|
       map.home '/home/sweet/home/:user', :controller => 'home', :action => 'index'
@@ -231,7 +231,7 @@ class UrlWriterTests < Test::Unit::TestCase
       controller.send(:home_url, :host => 'www.basecamphq.com', :user => 'again')
   ensure
     ActionController::Routing::Routes.load!
-    ActionController::AbstractRequest.relative_url_root = orig_relative_url_root
+    ActionController::Base.relative_url_root = orig_relative_url_root
   end
 
   def test_only_path
@@ -239,14 +239,14 @@ class UrlWriterTests < Test::Unit::TestCase
       map.home '/home/sweet/home/:user', :controller => 'home', :action => 'index'
       map.connect ':controller/:action/:id'
     end
-    
+
     # We need to create a new class in order to install the new named route.
     kls = Class.new { include ActionController::UrlWriter }
     controller = kls.new
     assert controller.respond_to?(:home_url)
     assert_equal '/brave/new/world',
       controller.send(:url_for, :controller => 'brave', :action => 'new', :id => 'world', :only_path => true)
-    
+
     assert_equal("/home/sweet/home/alabama", controller.send(:home_url, :user => 'alabama', :host => 'unused', :only_path => true))
     assert_equal("/home/sweet/home/alabama", controller.send(:home_path, 'alabama'))
   ensure
@@ -306,5 +306,4 @@ class UrlWriterTests < Test::Unit::TestCase
     def extract_params(url)
       url.split('?', 2).last.split('&')
     end
-
 end
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 0e7f9a94b7..8410e82c3c 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -30,7 +30,6 @@ class AssetTagHelperTest < ActionView::TestCase
     end.new
 
     @request = Class.new do
-      def relative_url_root() "" end
       def protocol() 'http://' end
       def ssl?() false end
       def host_with_port() 'localhost' end
@@ -118,7 +117,7 @@ class AssetTagHelperTest < ActionView::TestCase
     %(image_path("xml"))          => %(/images/xml),
     %(image_path("xml.png"))      => %(/images/xml.png),
     %(image_path("dir/xml.png"))  => %(/images/dir/xml.png),
-    %(image_path("/dir/xml.png")) => %(/dir/xml.png)    
+    %(image_path("/dir/xml.png")) => %(/dir/xml.png)
   }
 
   PathToImageToTag = {
@@ -173,7 +172,7 @@ class AssetTagHelperTest < ActionView::TestCase
     ActionView::Helpers::AssetTagHelper::register_javascript_include_default 'lib1', '/elsewhere/blub/lib2'
     assert_dom_equal  %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/slider.js" type="text/javascript"></script>\n<script src="/javascripts/lib1.js" type="text/javascript"></script>\n<script src="/elsewhere/blub/lib2.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>), javascript_include_tag(:defaults)
   end
-  
+
   def test_custom_javascript_expansions
     ActionView::Helpers::AssetTagHelper::register_javascript_expansion :monkey => ["head", "body", "tail"]
     assert_dom_equal  %(<script src="/javascripts/first.js" type="text/javascript"></script>\n<script src="/javascripts/head.js" type="text/javascript"></script>\n<script src="/javascripts/body.js" type="text/javascript"></script>\n<script src="/javascripts/tail.js" type="text/javascript"></script>\n<script src="/javascripts/last.js" type="text/javascript"></script>), javascript_include_tag('first', :monkey, 'last')
@@ -216,7 +215,7 @@ class AssetTagHelperTest < ActionView::TestCase
   def test_image_path
     ImagePathToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
-  
+
   def test_path_to_image_alias_for_image_path
     PathToImageToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
@@ -224,7 +223,7 @@ class AssetTagHelperTest < ActionView::TestCase
   def test_image_tag
     ImageLinkToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
-  
+
   def test_timebased_asset_id
     expected_time = File.stat(File.expand_path(File.dirname(__FILE__) + "/../fixtures/public/images/rails.png")).mtime.to_i.to_s
     assert_equal %(<img alt="Rails" src="/images/rails.png?#{expected_time}" />), image_tag("rails.png")
@@ -233,7 +232,7 @@ class AssetTagHelperTest < ActionView::TestCase
   def test_should_skip_asset_id_on_complete_url
     assert_equal %(<img alt="Rails" src="http://www.example.com/rails.png" />), image_tag("http://www.example.com/rails.png")
   end
-  
+
   def test_should_use_preset_asset_id
     ENV["RAILS_ASSET_ID"] = "4500"
     assert_equal %(<img alt="Rails" src="/images/rails.png?4500" />), image_tag("rails.png")
@@ -255,14 +254,14 @@ class AssetTagHelperTest < ActionView::TestCase
     ENV["RAILS_ASSET_ID"] = ""
     ActionController::Base.asset_host = 'http://a0.example.com'
     ActionController::Base.perform_caching = true
-    
+
     assert_dom_equal(
       %(<script src="http://a0.example.com/javascripts/all.js" type="text/javascript"></script>),
       javascript_include_tag(:all, :cache => true)
     )
 
     assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'all.js'))
-    
+
     assert_dom_equal(
       %(<script src="http://a0.example.com/javascripts/money.js" type="text/javascript"></script>),
       javascript_include_tag(:all, :cache => "money")
@@ -344,7 +343,7 @@ class AssetTagHelperTest < ActionView::TestCase
   ensure
     FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'cache', 'money.js'))
   end
-  
+
   def test_caching_javascript_include_tag_with_all_and_recursive_puts_defaults_at_the_start_of_the_file
     ENV["RAILS_ASSET_ID"] = ""
     ActionController::Base.asset_host = 'http://a0.example.com'
@@ -390,7 +389,7 @@ class AssetTagHelperTest < ActionView::TestCase
   def test_caching_javascript_include_tag_when_caching_off
     ENV["RAILS_ASSET_ID"] = ""
     ActionController::Base.perform_caching = false
-    
+
     assert_dom_equal(
       %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>\n<script src="/javascripts/version.1.0.js" type="text/javascript"></script>),
       javascript_include_tag(:all, :cache => true)
@@ -402,7 +401,7 @@ class AssetTagHelperTest < ActionView::TestCase
     )
 
     assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'all.js'))
-    
+
     assert_dom_equal(
       %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>\n<script src="/javascripts/version.1.0.js" type="text/javascript"></script>),
       javascript_include_tag(:all, :cache => "money")
@@ -420,7 +419,7 @@ class AssetTagHelperTest < ActionView::TestCase
     ENV["RAILS_ASSET_ID"] = ""
     ActionController::Base.asset_host = 'http://a0.example.com'
     ActionController::Base.perform_caching = true
-    
+
     assert_dom_equal(
       %(<link href="http://a0.example.com/stylesheets/all.css" media="screen" rel="stylesheet" type="text/css" />),
       stylesheet_link_tag(:all, :cache => true)
@@ -459,7 +458,7 @@ class AssetTagHelperTest < ActionView::TestCase
   def test_caching_stylesheet_include_tag_when_caching_off
     ENV["RAILS_ASSET_ID"] = ""
     ActionController::Base.perform_caching = false
-    
+
     assert_dom_equal(
       %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/version.1.0.css" media="screen" rel="stylesheet" type="text/css" />),
       stylesheet_link_tag(:all, :cache => true)
@@ -471,7 +470,7 @@ class AssetTagHelperTest < ActionView::TestCase
     )
 
     assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
-    
+
     assert_dom_equal(
       %(<link href="/stylesheets/bank.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/robber.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/version.1.0.css" media="screen" rel="stylesheet" type="text/css" />),
       stylesheet_link_tag(:all, :cache => "money")
@@ -490,6 +489,8 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
   tests ActionView::Helpers::AssetTagHelper
 
   def setup
+    ActionController::Base.relative_url_root = "/collaboration/hieraki"
+
     @controller = Class.new do
       attr_accessor :request
 
@@ -497,22 +498,22 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
         "http://www.example.com/collaboration/hieraki"
       end
     end.new
-    
-    @request = Class.new do 
-      def relative_url_root
-        "/collaboration/hieraki"
-      end
 
+    @request = Class.new do
       def protocol
         'gopher://'
       end
     end.new
-    
+
     @controller.request = @request
-    
+
     ActionView::Helpers::AssetTagHelper::reset_javascript_include_default
   end
 
+  def teardown
+    ActionController::Base.relative_url_root = nil
+  end
+
   def test_should_compute_proper_path
     assert_dom_equal(%(<link href="http://www.example.com/collaboration/hieraki" rel="alternate" title="RSS" type="application/rss+xml" />), auto_discovery_link_tag)
     assert_dom_equal(%(/collaboration/hieraki/javascripts/xmlhr.js), javascript_path("xmlhr"))
@@ -521,7 +522,7 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
     assert_dom_equal(%(<img alt="Mouse" onmouseover="this.src='/collaboration/hieraki/images/mouse_over.png'" onmouseout="this.src='/collaboration/hieraki/images/mouse.png'" src="/collaboration/hieraki/images/mouse.png" />), image_tag("mouse.png", :mouseover => "/images/mouse_over.png"))
     assert_dom_equal(%(<img alt="Mouse2" onmouseover="this.src='/collaboration/hieraki/images/mouse_over2.png'" onmouseout="this.src='/collaboration/hieraki/images/mouse2.png'" src="/collaboration/hieraki/images/mouse2.png" />), image_tag("mouse2.png", :mouseover => image_path("mouse_over2.png")))
   end
-  
+
   def test_should_ignore_relative_root_path_on_complete_url
     assert_dom_equal(%(http://www.example.com/images/xml.png), image_path("http://www.example.com/images/xml.png"))
   end